Merge branch 'search-commit-ui-fix' into 'master'

Fixed commit search UI ## What does this MR do? Fixes the UI for commits in search. If the scope of the search is commits then it renders the list in a `ul` to match the same styling as that on the commits UI. ## Screenshots (if relevant) ![Screen_Shot_2016-09-05_at_15.30.12](/uploads/f567a224be44d5a9b015ac5d1c399bd7/Screen_Shot_2016-09-05_at_15.30.12.png) ## What are the relevant issue numbers? Closes #21868 See merge request !6205

Merge branch 'search-commit-ui-fix' into 'master'
5fa3aeb0 · Jacob Schatz · fe3692ac · 0ffacb8e · 5fa3aeb0 · 5fa3aeb0
Commit 5fa3aeb0 authored Sep 16, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

_results.html.haml app/views/search/_results.html.haml +10 -6

_commit.html.haml app/views/search/results/_commit.html.haml +1 -2

No files found.
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -10,12 +10,16 @@
        in group #{link_to @group.name, @group}
  .results.prepend-top-10
-    .search-results
+    - if @scope == 'commits'
-      - if @scope == 'projects'
+      %ul.list-unstyled
-        .term
+        = render partial: "search/results/commit", collection: @search_objects
-          = render 'shared/projects/list', projects: @search_objects
+    - else
-      - else
+      .search-results
-        = render partial: "search/results/#{@scope.singularize}", collection: @search_objects
+        - if @scope == 'projects'
+          .term
+            = render 'shared/projects/list', projects: @search_objects
+        - else
+          = render partial: "search/results/#{@scope.singularize}", collection: @search_objects
    - if @scope != 'projects'
      = paginate(@search_objects, theme: 'gitlab')
--- a/app/views/search/results/_commit.html.haml
+++ b/app/views/search/results/_commit.html.haml
-.search-result-row
+= render 'projects/commits/commit', project: @project, commit: commit
-  = render 'projects/commits/commit', project: @project, commit: commit