Add latest changes from gitlab-org/gitlab@master

4 files changed, 16 insertions, 4 deletions

diff --git a/app/services/award_emojis/add_service.rb b/app/services/award_emojis/add_service.rb
index eac15dabbf0..db465dcaf7e 100644
--- a/app/services/award_emojis/add_service.rb
+++ b/app/services/award_emojis/add_service.rb
@@ -16,7 +16,7 @@ module AwardEmojis
       award = awardable.award_emoji.create(name: name, user: current_user)
 
       if award.persisted?
-        TodoService.new.new_award_emoji(todoable, current_user) if todoable
+        after_create(award)
         success(award: award)
       else
         error(award.errors.full_messages, award: award)
@@ -25,6 +25,10 @@ module AwardEmojis
 
     private
 
+    def after_create(award)
+      TodoService.new.new_award_emoji(todoable, current_user) if todoable
+    end
+
     def todoable
       strong_memoize(:todoable) do
         case awardable
@@ -40,3 +44,5 @@ module AwardEmojis
     end
   end
 end
+
+AwardEmojis::AddService.prepend_if_ee('EE::AwardEmojis::AddService')
diff --git a/app/services/award_emojis/destroy_service.rb b/app/services/award_emojis/destroy_service.rb
index 3789a8403bc..a61a7911a9d 100644
--- a/app/services/award_emojis/destroy_service.rb
+++ b/app/services/award_emojis/destroy_service.rb
@@ -14,8 +14,16 @@ module AwardEmojis
       end
 
       award = awards.destroy_all.first # rubocop: disable DestroyAll
+      after_destroy(award)
 
       success(award: award)
     end
+
+    private
+
+    def after_destroy(award)
+    end
   end
 end
+
+AwardEmojis::DestroyService.prepend_if_ee('EE::AwardEmojis::DestroyService')
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index 337710b60e0..9637eb1b918 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -133,7 +133,7 @@ module Boards
 
       def can_attempt_search_optimization?
         params[:search].present? &&
-          Feature.enabled?(:board_search_optimization, board_group, default_enabled: false)
+          Feature.enabled?(:board_search_optimization, board_group, default_enabled: true)
       end
     end
   end
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb
index 2cf4bbcd590..8594808cd44 100644
--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -59,8 +59,6 @@ module Issues
     end
 
     def store_first_mentioned_in_commit_at(issue, merge_request)
-      return unless Feature.enabled?(:store_first_mentioned_in_commit_on_issue_close, issue.project, default_enabled: true)
-
       metrics = issue.metrics
       return if metrics.nil? || metrics.first_mentioned_in_commit_at