From a3394f288648e31144105f0db249aea9dd5c5922 Mon Sep 17 00:00:00 2001
From: Ahmed Khanzada <lenzuru@gmail.com>
Date: Thu, 19 Mar 2020 15:44:49 -0700
Subject: [PATCH 1/3] Squash options

---
 .../components/states/ready_to_merge.vue      | 10 +++++-
 .../components/states/squash_before_merge.vue |  2 +-
 .../stores/mr_widget_store.js                 |  4 ++-
 app/models/project.rb                         | 12 +++++++
 ...merge_request_poll_cached_widget_entity.rb |  8 +++++
 .../merge_request_poll_widget_entity.rb       |  8 +++++
 .../_merge_request_settings.html.haml         |  2 ++
 ..._request_squash_options_settings.html.haml | 36 +++++++++++++++++++
 .../issuable/form/_merge_params.html.haml     |  2 +-
 .../_merge_request_settings.html.haml         |  2 ++
 10 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 app/views/projects/_merge_request_squash_options_settings.html.haml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index e34060c3393a28..11159423378cca 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -104,6 +104,14 @@ export default {
       const { commitsCount, enableSquashBeforeMerge } = this.mr;
       return enableSquashBeforeMerge && commitsCount > 1;
     },
+    isSquashButtonSelected() {
+      return this.mr.squashValueDefault;
+    },
+    isSquashButtonDisabled() {
+      console.log(this.mr.squashValueReadonly);
+      console.log(this.mr);
+      return this.isMergeButtonDisabled || this.mr.squashValueReadonly;
+    },
     shouldShowMergeControls() {
       return this.mr.isMergeAllowed || this.isAutoMergeAvailable;
     },
@@ -339,7 +347,7 @@ export default {
                 v-if="shouldShowSquashBeforeMerge"
                 v-model="squashBeforeMerge"
                 :help-path="mr.squashBeforeMergeHelpPath"
-                :is-disabled="isMergeButtonDisabled"
+                :is-disabled="isSquashButtonDisabled"
               />
             </template>
             <template v-else>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
index 98f682c2e8ad08..fb3cf45b186d18 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
@@ -23,7 +23,7 @@ export default {
       type: Boolean,
       required: false,
       default: false,
-    },
+    }
   },
 };
 </script>
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 321b9270ddef9b..903f2f9b6be458 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -22,7 +22,6 @@ export default class MergeRequestStore {
     const pipelineStatus = data.pipeline ? data.pipeline.details.status : null;
 
     this.squash = data.squash;
-    this.enableSquashBeforeMerge = this.enableSquashBeforeMerge || true;
 
     this.iid = data.iid;
     this.title = data.title;
@@ -47,6 +46,9 @@ export default class MergeRequestStore {
     this.postMergeDeployments = this.postMergeDeployments || [];
     this.commits = data.commits_without_merge_commits || [];
     this.squashCommitMessage = data.default_squash_commit_message;
+    this.squashValueDefault = data.squash_value_default;
+    this.squashValueReadonly = data.squash_value_readonly;
+    this.enableSquashBeforeMerge = !((this.squashValueDefault == false) && (this.squashValueReadonly == true))
     this.rebaseInProgress = data.rebase_in_progress;
     this.mergeRequestDiffsPath = data.diffs_path;
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 7e006e734c548f..ce361a74889694 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2195,6 +2195,18 @@ def merge_method
     end
   end
 
+  def squash_option
+    :always
+  end
+
+  def squash_value_default
+    squash_option == :always || squash_option == :enabled
+  end
+
+  def squash_value_readonly
+    squash_option == :always || squash_option == :never
+  end
+
   def merge_method=(method)
     case method.to_s
     when "ff"
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb
index 2f8eb6650e8ba5..7081c61a5d54b6 100644
--- a/app/serializers/merge_request_poll_cached_widget_entity.rb
+++ b/app/serializers/merge_request_poll_cached_widget_entity.rb
@@ -74,6 +74,14 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity
     diffs_project_merge_request_path(merge_request.project, merge_request)
   end
 
+  expose :squash_value_default do |merge_request|
+    presenter(merge_request).project.squash_value_default
+  end
+
+  expose :squash_value_readonly do |merge_request|
+    presenter(merge_request).project.squash_value_readonly
+  end
+
   private
 
   delegate :current_user, to: :request
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index a45026ea0167ad..7b6decebb274e1 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -133,6 +133,14 @@ class MergeRequestPollWidgetEntity < Grape::Entity
     presenter(merge_request).revert_in_fork_path
   end
 
+  expose :squash_value_default do |merge_request|
+    presenter(merge_request).project.squash_value_default
+  end
+
+  expose :squash_value_readonly do |merge_request|
+    presenter(merge_request).project.squash_value_readonly
+  end
+
   private
 
   delegate :current_user, to: :request
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml
index dc3a3fcc6473cc..998959284a3510 100644
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
@@ -7,3 +7,5 @@
 = render 'projects/merge_request_merge_checks_settings', project: @project, form: form
 
 = render 'projects/merge_request_merge_suggestions_settings', project: @project, form: form
+
+= render 'projects/merge_request_squash_options_settings', project: @project, form: form
diff --git a/app/views/projects/_merge_request_squash_options_settings.html.haml b/app/views/projects/_merge_request_squash_options_settings.html.haml
new file mode 100644
index 00000000000000..e381ac47ce52f6
--- /dev/null
+++ b/app/views/projects/_merge_request_squash_options_settings.html.haml
@@ -0,0 +1,36 @@
+- form = local_assigns.fetch(:form)
+
+.form-group
+  %b= s_('ProjectSettings|Squash options')
+  %p.text-secondary= s_('ProjectSettings|This determines what kind of squashing is available or enforced')
+  .form-check.mb-2
+    = form.radio_button :squash_option, :never, class: "js-squash-option-radio form-check-input"
+    = label_tag :project_squash_option_never, class: 'form-check-label' do
+      = s_('ProjectSettings|Never')
+      .text-secondary
+        = s_('ProjectSettings|Do not allow squashing ever')
+
+  .form-check.mb-2
+    = form.radio_button :squash_option, :allow, class: "js-squash-option-radio form-check-input"
+    = label_tag :project_squash_option_allow, class: 'form-check-label' do
+      = s_('ProjectSettings|Allow')
+      .text-secondary
+        = s_('ProjectSettings|Squash is allowed')
+        %br
+        = s_('ProjectSettings|Squash is disabled by default')
+
+  .form-check.mb-2
+    = form.radio_button :squash_option, :enabled, class: "js-squash-option-radio qa-radio-button-merge-ff form-check-input"
+    = label_tag :project_squash_option_enabled, class: 'form-check-label' do
+      = s_('ProjectSettings|Enabled')
+      .text-secondary
+        = s_('ProjectSettings|Squash is allowed')
+        %br
+        = s_('ProjectSettings|Squash is enabled by default')
+
+  .form-check.mb-2
+    = form.radio_button :squash_option, :always, class: "js-squash-option-radio form-check-input"
+    = label_tag :project_squash_option_always, class: 'form-check-label' do
+      = s_('ProjectSettings|Allows')
+      .text-secondary
+        = s_('ProjectSettings|Enforce squashing for all')
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml
index 1b557214e0204e..6086fb2c25377b 100644
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -16,7 +16,7 @@
           Delete source branch when merge request is accepted.
     .form-check
       = hidden_field_tag 'merge_request[squash]', '0', id: nil
-      = check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input'
+      = check_box_tag 'merge_request[squash]', '1', @project.squash_value_default, class: 'form-check-input', disabled: @project.squash_value_readonly
       = label_tag 'merge_request[squash]', class: 'form-check-label' do
         Squash commits when merge request is accepted.
         = link_to icon('question-circle'), help_page_path('user/project/merge_requests/squash_and_merge'), target: '_blank'
diff --git a/ee/app/views/projects/_merge_request_settings.html.haml b/ee/app/views/projects/_merge_request_settings.html.haml
index c989649267e944..4925243087ea5c 100644
--- a/ee/app/views/projects/_merge_request_settings.html.haml
+++ b/ee/app/views/projects/_merge_request_settings.html.haml
@@ -8,6 +8,8 @@
 
 = render 'projects/merge_request_merge_suggestions_settings', project: @project, form: form
 
+= render_ce 'projects/merge_request_squash_options_settings', project: @project, form: form
+
 - if @project.feature_available?(:issuable_default_templates)
   .form-group
     = form.label :merge_requests_template, class: 'label-bold' do
-- 
GitLab


From e39963463e4fda7dc218a4c95a08abbbf72bfe89 Mon Sep 17 00:00:00 2001
From: Ahmed Khanzada <lenzuru@gmail.com>
Date: Thu, 26 Mar 2020 14:21:30 -0700
Subject: [PATCH 2/3] Add squash option on model level

---
 app/models/project.rb                           |  6 ++----
 ...200326201949_add_squash_option_to_project.rb | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20200326201949_add_squash_option_to_project.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index ce361a74889694..b6979270b583d7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -494,6 +494,8 @@ class Project < ApplicationRecord
 
   enum auto_cancel_pending_pipelines: { disabled: 0, enabled: 1 }
 
+  enum squash_option: [:never, :disabled, :enabled, :always]
+
   chronic_duration_attr :build_timeout_human_readable, :build_timeout,
     default: 3600, error_message: _('Maximum job timeout has a value which could not be accepted')
 
@@ -2195,10 +2197,6 @@ def merge_method
     end
   end
 
-  def squash_option
-    :always
-  end
-
   def squash_value_default
     squash_option == :always || squash_option == :enabled
   end
diff --git a/db/migrate/20200326201949_add_squash_option_to_project.rb b/db/migrate/20200326201949_add_squash_option_to_project.rb
new file mode 100644
index 00000000000000..b62a5e6f4b40fc
--- /dev/null
+++ b/db/migrate/20200326201949_add_squash_option_to_project.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddSquashOptionToProject < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :projects, :squash_option, :integer
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :projects, :squash_option
+    end
+  end
+end
-- 
GitLab


From 42b2d9634c2acf8e6b80d89dbf2f74177a3b298f Mon Sep 17 00:00:00 2001
From: Ahmed Khanzada <lenzuru@gmail.com>
Date: Thu, 16 Apr 2020 20:27:56 -0700
Subject: [PATCH 3/3] Consistency checks

---
 app/services/merge_requests/merge_service.rb        | 13 ++++++++++++-
 ..._merge_request_squash_options_settings.html.haml |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index 31097b9151a133..0e0081854d9fa6 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -38,6 +38,7 @@ def validate!
       authorization_check!
       error_check!
       updated_check!
+      squash_consistency_check!
     end
 
     def authorization_check!
@@ -64,7 +65,17 @@ def error_check!
     def updated_check!
       unless source_matches?
         raise_error('Branch has been updated since the merge was requested. '\
-                    'Please review the changes.')
+          'Please review the changes.')
+      end
+    end
+
+    def squash_consistency_check
+      if @merge_request.squash_option == :always
+        raise_error('This repository now requires squashing for merge requests. '\
+          'Please review the changes.')
+      elsif @merge_request.squash_option == :never
+        raise_error('This repository now prohibits squashing for merge requests. '\
+          'Please review the changes.')
       end
     end
 
diff --git a/app/views/projects/_merge_request_squash_options_settings.html.haml b/app/views/projects/_merge_request_squash_options_settings.html.haml
index e381ac47ce52f6..b19c9b239ddea5 100644
--- a/app/views/projects/_merge_request_squash_options_settings.html.haml
+++ b/app/views/projects/_merge_request_squash_options_settings.html.haml
@@ -31,6 +31,6 @@
   .form-check.mb-2
     = form.radio_button :squash_option, :always, class: "js-squash-option-radio form-check-input"
     = label_tag :project_squash_option_always, class: 'form-check-label' do
-      = s_('ProjectSettings|Allows')
+      = s_('ProjectSettings|Always')
       .text-secondary
         = s_('ProjectSettings|Enforce squashing for all')
-- 
GitLab