Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 9 insertions, 5 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index dcd80201d3f..0138c0ad20f 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -194,6 +194,8 @@ module Issuable
     end
 
     def supports_escalation?
+      return false unless ::Feature.enabled?(:incident_escalations, project)
+
       incident?
     end
 
@@ -363,9 +365,10 @@ module Issuable
     end
 
     # Includes table keys in group by clause when sorting
-    # preventing errors in postgres
+    # preventing errors in Postgres
+    #
+    # Returns an array of Arel columns
     #
-    # Returns an array of arel columns
     def grouping_columns(sort)
       sort = sort.to_s
       grouping_columns = [arel_table[:id]]
@@ -384,9 +387,10 @@ module Issuable
     end
 
     # Includes all table keys in group by clause when sorting
-    # preventing errors in postgres when using CTE search optimisation
+    # preventing errors in Postgres when using CTE search optimization
+    #
+    # Returns an array of Arel columns
     #
-    # Returns an array of arel columns
     def issue_grouping_columns(use_cte: false)
       if use_cte
         attribute_names.map { |attr| arel_table[attr.to_sym] }
@@ -576,7 +580,7 @@ module Issuable
   ##
   # Overridden in MergeRequest
   #
-  def wipless_title_changed(old_title)
+  def draftless_title_changed(old_title)
     old_title != title
   end
 end