diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-16 23:43:26 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-16 23:43:26 +0000 |
| commit | 5fa3aeb02ae4a86f3cb69d91f50571d6f7840f3f (patch) | |
| tree | fea1cbcf4cea2db6d2e0d81de1f23e814583fbd3 /app/views/search | |
| parent | fe3692ac1a2ce222e41c9d2f34d80ab8d727830d (diff) | |
| parent | 0ffacb8e7fe7fe59648452cc19c05b4c5055a217 (diff) | |
| download | gitlab-ce-5fa3aeb02ae4a86f3cb69d91f50571d6f7840f3f.tar.gz | |
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)
## What are the relevant issue numbers?
Closes #21868
See merge request !6205
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_results.html.haml | 16 | ||||
| -rw-r--r-- | app/views/search/results/_commit.html.haml | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index 252c37532e1..7fe2bce3e7c 100644 --- 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 == 'projects' - .term - = render 'shared/projects/list', projects: @search_objects - - else - = render partial: "search/results/#{@scope.singularize}", collection: @search_objects + - if @scope == 'commits' + %ul.list-unstyled + = render partial: "search/results/commit", collection: @search_objects + - else + .search-results + - 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') diff --git a/app/views/search/results/_commit.html.haml b/app/views/search/results/_commit.html.haml index 4e6c3965dc6..5b2d83d6b92 100644 --- a/app/views/search/results/_commit.html.haml +++ b/app/views/search/results/_commit.html.haml @@ -1,2 +1 @@ -.search-result-row - = render 'projects/commits/commit', project: @project, commit: commit += render 'projects/commits/commit', project: @project, commit: commit |