Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 9 deletions

diff --git a/app/views/search/_results_list.html.haml b/app/views/search/_results_list.html.haml
index fb96672cf99..dad352e376b 100644
--- a/app/views/search/_results_list.html.haml
+++ b/app/views/search/_results_list.html.haml
@@ -8,9 +8,7 @@
 - elsif @search_objects.blank?
   = render partial: "search/results/empty"
 - else
-  - statusBarClass = !show_super_sidebar? ? 'gl-lg-pl-5' : ''
-
-  .section{ class: statusBarClass }
+  .section
     - if @scope == 'commits'
       %ul.content-list.commit-list
         = render partial: "search/results/commit", collection: @search_objects
diff --git a/app/views/search/_results_status.html.haml b/app/views/search/_results_status.html.haml
index 8417b66eb34..3c42126e480 100644
--- a/app/views/search/_results_status.html.haml
+++ b/app/views/search/_results_status.html.haml
@@ -1,7 +1,4 @@
-- statusBarClass = !show_super_sidebar? ? 'gl-lg-pl-5' : ''
-- statusBarClass = statusBarClass + ' gl-lg-display-none' if @search_objects.to_a.empty?
-
-.section{ class: statusBarClass }
+.section{ class: ('gl-lg-display-none' if @search_objects.to_a.empty?) }
   .search-results-status
     .gl-display-flex.gl-flex-direction-column
       .gl-p-5.gl-display-flex.gl-flex-wrap
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index 4ddeca64c7d..af3177e4422 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -16,8 +16,8 @@
     - page_description(_("%{count} %{scope} for term '%{term}'") % { count: @search_results.formatted_count(@scope), scope: @scope, term: @search_term })
   - page_card_attributes("Namespace" => @group&.full_path, "Project" => @project&.full_path)
 
-#js-search-topbar{ data: { "group-initial-json": group_attributes.to_json, "project-initial-json": project_attributes.to_json, "default-branch-name": @project&.default_branch } }
+#js-search-topbar{ data: { "default-branch-name": @project&.default_branch } }
 .results.gl-lg-display-flex.gl-mt-0
-  #js-search-sidebar{ data: { navigation_json: search_navigation_json, search_type: search_service.search_type } }
+  #js-search-sidebar{ data: { navigation_json: search_navigation_json, search_type: search_service.search_type, group_initial_json: group_attributes.to_json, project_initial_json: project_attributes.to_json, } }
   - if @search_term
     = render 'search/results'