diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-24 12:23:35 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-24 12:23:35 +0000 |
| commit | 0e6e924b8b09ff9db9d4d1a70c5e9e59f62bff68 (patch) | |
| tree | a05dc0b00800fa7b41a89f4962ec0e332c2cc5b9 /app | |
| parent | 2dcf96629ae10a225d21fa8734f00d0e84918bbb (diff) | |
| parent | 6905a62867067f2f61feb6734be3972cb5b9f7a7 (diff) | |
| download | gitlab-ce-0e6e924b8b09ff9db9d4d1a70c5e9e59f62bff68.tar.gz | |
Merge branch 'search-blob-basenames' into 'master'
Build correct basenames for title search results
See merge request gitlab-org/gitlab-ce!29898
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/search/results/_wiki_blob.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml index 5847751b268..b351ecd4edf 100644 --- a/app/views/search/results/_wiki_blob.html.haml +++ b/app/views/search/results/_wiki_blob.html.haml @@ -1,5 +1,5 @@ - project = find_project_for_result_blob(projects, wiki_blob) - wiki_blob = parse_search_result(wiki_blob) -- wiki_blob_link = project_wiki_path(project, Pathname.new(wiki_blob.filename).sub_ext('')) +- wiki_blob_link = project_wiki_path(project, wiki_blob.basename) = render partial: 'search/results/blob_data', locals: { blob: wiki_blob, project: project, file_name: wiki_blob.filename, blob_link: wiki_blob_link } |