Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 15 insertions, 0 deletions

diff --git a/app/models/project_setting.rb b/app/models/project_setting.rb
index 9022d3e879d..aca7eec3382 100644
--- a/app/models/project_setting.rb
+++ b/app/models/project_setting.rb
@@ -3,7 +3,22 @@
 class ProjectSetting < ApplicationRecord
   belongs_to :project, inverse_of: :project_setting
 
+  enum squash_option: {
+    never: 0,
+    always: 1,
+    default_on: 2,
+    default_off: 3
+  }, _prefix: 'squash'
+
   self.primary_key = :project_id
+
+  def squash_enabled_by_default?
+    %w[always default_on].include?(squash_option)
+  end
+
+  def squash_readonly?
+    %w[always never].include?(squash_option)
+  end
 end
 
 ProjectSetting.prepend_if_ee('EE::ProjectSetting')