Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/search_context.rb b/lib/gitlab/search_context.rb
index c3bb0ff26f2..0323220690a 100644
--- a/lib/gitlab/search_context.rb
+++ b/lib/gitlab/search_context.rb
@@ -129,7 +129,10 @@ module Gitlab
           'wiki_blobs'
         elsif view_context.current_controller?(:commits)
           'commits'
-        else nil
+        elsif view_context.current_controller?(:groups)
+          if %w(issues merge_requests).include?(view_context.controller.action_name)
+            view_context.controller.action_name
+          end
         end
       end
     end
@@ -160,3 +163,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::SearchContext::Builder.prepend_ee_mod