diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 12:06:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 12:06:07 +0300 |
| commit | d23b2a0871f3ca507aafa949e0314625f1f0c6a7 (patch) | |
| tree | b1e26c7460bdae25f19103e14978a3aaeef52037 /app/views/search | |
| parent | 1ef4b65f55f4fc6524a47050b4f6d686beb81d3a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/results/_snippet_blob.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/results/_snippet_title.html.haml | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml index f17dae0a94c..37f4efee9d2 100644 --- a/app/views/search/results/_snippet_blob.html.haml +++ b/app/views/search/results/_snippet_blob.html.haml @@ -1,6 +1,7 @@ - snippet_blob = chunk_snippet(snippet_blob, @search_term) - snippet = snippet_blob[:snippet_object] - snippet_chunks = snippet_blob[:snippet_chunks] +- snippet_path = reliable_snippet_path(snippet) .search-result-row %span @@ -11,7 +12,6 @@ = snippet.author_name %span.light= time_ago_with_tooltip(snippet.created_at) %h4.snippet-title - - snippet_path = reliable_snippet_path(snippet) .file-holder .js-file-title.file-title = link_to snippet_path do diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml index 1e01088d9e6..7280146720e 100644 --- a/app/views/search/results/_snippet_title.html.haml +++ b/app/views/search/results/_snippet_title.html.haml @@ -2,10 +2,7 @@ %h4.snippet-title.term = link_to reliable_snippet_path(snippet_title) do = truncate(snippet_title.title, length: 60) - - if snippet_title.private? - %span.badge.badge-gray - %i.fa.fa-lock - = _("private") + = snippet_badge(snippet_title) %span.cgray.monospace.tiny.float-right.term = snippet_title.file_name |