diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/views/search/_results.html.haml | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/views/search/_results.html.haml')
| -rw-r--r-- | app/views/search/_results.html.haml | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 4ba906dd02f..d5d3cd753f3 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -1,20 +1,16 @@ - search_bar_classes = 'search-sidebar gl-display-flex gl-flex-direction-column gl-mr-4' += render_if_exists 'shared/promotions/promote_advanced_search' += render partial: 'search/results_status', locals: { search_service: @search_service } unless @search_objects.to_a.empty? -- if @search_objects.to_a.empty? - .gl-md-display-flex - - if %w(issues merge_requests).include?(@scope) - #js-search-sidebar{ class: search_bar_classes } - .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden +.results.gl-md-display-flex.gl-mt-3 + - if %w(issues merge_requests).include?(@scope) + #js-search-sidebar{ class: search_bar_classes } + .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden + - if @timeout + = render partial: "search/results/timeout" + - elsif @search_objects.to_a.empty? = render partial: "search/results/empty" - = render_if_exists 'shared/promotions/promote_advanced_search' -- else - = render partial: 'search/results_status', locals: { search_service: @search_service } - = render_if_exists 'shared/promotions/promote_advanced_search' - - .results.gl-md-display-flex.gl-mt-3 - - if %w(issues merge_requests).include?(@scope) - #js-search-sidebar{ class: search_bar_classes } - .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden + - else - if @scope == 'commits' %ul.content-list.commit-list = render partial: "search/results/commit", collection: @search_objects |