diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-11 13:28:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-11 13:28:31 +0000 |
| commit | 180dc237152d60d05e4f75d8c936e81ba783b6cd (patch) | |
| tree | 861f0c0a163af3898d7334a3f1d9adb3860f0fab | |
| parent | 77032638d674efdbcc203018783475b915181c8d (diff) | |
| parent | 41cfe904b7f3c3a981b83c17e3222d974e29d611 (diff) | |
| download | gitlab-ce-180dc237152d60d05e4f75d8c936e81ba783b6cd.tar.gz | |
Merge branch 'unify-views-search-results' into 'master'
Hide project name if searching against a project
See merge request gitlab-org/gitlab-ce!19595
| -rw-r--r-- | app/views/search/results/_blob_data.html.haml | 3 | ||||
| -rw-r--r-- | app/views/search/results/_commit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/unify-views-search-results.yml | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/views/search/results/_blob_data.html.haml b/app/views/search/results/_blob_data.html.haml index 0115be41ff1..143e9f91ca3 100644 --- a/app/views/search/results/_blob_data.html.haml +++ b/app/views/search/results/_blob_data.html.haml @@ -3,7 +3,8 @@ .js-file-title.file-title = link_to blob_link do %i.fa.fa-file - = search_blob_title(project, file_name) + %strong + = search_blob_title(project, file_name) - if blob.data .file-content.code.term = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline diff --git a/app/views/search/results/_commit.html.haml b/app/views/search/results/_commit.html.haml index f34eaf89027..ed5a3badf11 100644 --- a/app/views/search/results/_commit.html.haml +++ b/app/views/search/results/_commit.html.haml @@ -1 +1 @@ -= render 'projects/commits/commit', project: @project, commit: commit, ref: nil += render 'projects/commits/commit', project: commit.project, commit: commit, ref: nil, show_project_name: @project.nil? diff --git a/changelogs/unreleased/unify-views-search-results.yml b/changelogs/unreleased/unify-views-search-results.yml new file mode 100644 index 00000000000..81ad3616648 --- /dev/null +++ b/changelogs/unreleased/unify-views-search-results.yml @@ -0,0 +1,5 @@ +--- +title: Hide project name if searching against a project +merge_request: 19595 +author: +type: changed |