Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops-table

1 files changed, 8 insertions, 6 deletions

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 98e824a8c65..af6683a548b 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -134,19 +134,21 @@ module SearchHelper
   end
 
   def search_filter_input_options(type)
-    opts = {
-      id: "filtered-search-#{type}",
-      placeholder: 'Search or filter results...',
-      data: {
-        'username-params' => @users.to_json(only: [:id, :username])
+    opts =
+      {
+        id: "filtered-search-#{type}",
+        placeholder: 'Search or filter results...',
+        data: {
+          'username-params' => @users.to_json(only: [:id, :username])
+        }
       }
-    }
 
     if @project.present?
       opts[:data]['project-id'] = @project.id
       opts[:data]['base-endpoint'] = project_path(@project)
     else
       # Group context
+      opts[:data]['group-id'] = @group.id
       opts[:data]['base-endpoint'] = group_canonical_path(@group)
     end