Merge branch 'ce-reduce-diff-in-search-global_service' into 'master'

Reduce diff with EE in Search::GlobalService

See merge request gitlab-org/gitlab-ce!24914

1 files changed, 10 insertions, 4 deletions

diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index cb1bf0a03a5..d6af26d949d 100644
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
@@ -2,6 +2,8 @@
 
 module Search
   class GlobalService
+    include Gitlab::Utils::StrongMemoize
+
     attr_accessor :current_user, :params
     attr_reader :default_project_filter
 
@@ -19,11 +21,15 @@ module Search
       @projects ||= ProjectsFinder.new(current_user: current_user).execute
     end
 
-    def scope
-      @scope ||= begin
-        allowed_scopes = %w[issues merge_requests milestones]
+    def allowed_scopes
+      strong_memoize(:allowed_scopes) do
+        %w[issues merge_requests milestones]
+      end
+    end
 
-        allowed_scopes.delete(params[:scope]) { 'projects' }
+    def scope
+      strong_memoize(:scope) do
+        allowed_scopes.include?(params[:scope]) ? params[:scope] : 'projects'
       end
     end
   end