diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 00:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 00:08:01 +0300 |
| commit | 4ba55564e1dd7fdbdb89065be8eefd01d8c2d607 (patch) | |
| tree | 32e6eaec4cf44b40607e3fd8c4077050c3ce9771 /app/views/search | |
| parent | 115c8ea7af7ef69ca3f09c333314546e9b5712f9 (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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml index 2dbd2a74602..0b114bf67ee 100644 --- a/app/views/search/results/_snippet_blob.html.haml +++ b/app/views/search/results/_snippet_blob.html.haml @@ -1,7 +1,7 @@ - snippet_blob = chunk_snippet(snippet_blob, @search_term) - snippet = snippet_blob[:snippet_object] - snippet_chunks = snippet_blob[:snippet_chunks] -- snippet_path = snippet_path(snippet) +- snippet_path = gitlab_snippet_path(snippet) .search-result-row %span diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml index a544e59c405..81e746c55a3 100644 --- a/app/views/search/results/_snippet_title.html.haml +++ b/app/views/search/results/_snippet_title.html.haml @@ -1,6 +1,6 @@ .search-result-row %h4.snippet-title.term - = link_to snippet_path(snippet_title) do + = link_to gitlab_snippet_path(snippet_title) do = truncate(snippet_title.title, length: 60) = snippet_badge(snippet_title) %span.cgray.monospace.tiny.float-right.term |