diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/views/search/_results.html.haml | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/views/search/_results.html.haml')
| -rw-r--r-- | app/views/search/_results.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 027ae6bf77c..5c952042663 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -3,16 +3,16 @@ = render_if_exists 'shared/promotions/promote_advanced_search' - if Feature.enabled?(:search_page_vertical_nav, current_user) .results.gl-md-display-flex.gl-mt-0 - #js-search-sidebar{ class: search_bar_classes, data: { navigation: search_navigation_json } } + #js-search-sidebar{ class: search_bar_classes, data: { navigation_json: search_navigation_json } } .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden - = render partial: 'search/results_status', locals: { search_service: @search_service } unless @search_objects.to_a.empty? + = render partial: 'search/results_status' unless @search_objects.to_a.empty? = render partial: 'search/results_list' - else - = render partial: 'search/results_status', locals: { search_service: @search_service } unless @search_objects.to_a.empty? + = render partial: 'search/results_status' unless @search_objects.to_a.empty? .results.gl-md-display-flex.gl-mt-3 - if %w[issues merge_requests].include?(@scope) - #js-search-sidebar{ class: search_bar_classes, data: { navigation: search_navigation_json } } + #js-search-sidebar{ class: search_bar_classes, data: { navigation_json: search_navigation_json } } .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden = render partial: 'search/results_list' |