diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-05 15:29:49 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-05 15:29:49 +0100 |
| commit | 0ffacb8e7fe7fe59648452cc19c05b4c5055a217 (patch) | |
| tree | 346688a5248ea5c75e5d4ea63183f32b6c191fcf | |
| parent | fe3d94e8e2e3f5d54575a7f16440cc1711617d2b (diff) | |
| download | gitlab-ce-0ffacb8e7fe7fe59648452cc19c05b4c5055a217.tar.gz | |
Fixed commit search UIsearch-commit-ui-fix
Closes #21868
| -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 |