diff options
author | Tomislav Nikic <tnikic@gitlab.com> | 2019-07-30 08:04:26 +0000 |
---|---|---|
committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-07-30 08:04:26 +0000 |
commit | 7906503d97b8481cf2be1331cb4479fef3806973 (patch) | |
tree | fbeb7b2f43edda17cd2c9f88d92e30add23c6805 /app/views/search | |
parent | 14e7cbe5813db792a4591565ea872745937e8406 (diff) | |
download | gitlab-ce-7906503d97b8481cf2be1331cb4479fef3806973.tar.gz |
Getting on par with EE
This commit covers all the files that where changed in the
identically named branch on EE that is creating an elasticsearch
test case.
Diffstat (limited to 'app/views/search')
-rw-r--r-- | app/views/search/_category.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_blob_data.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml index ee7d89a9bd8..18613ff4c16 100644 --- a/app/views/search/_category.html.haml +++ b/app/views/search/_category.html.haml @@ -12,7 +12,7 @@ %ul.nav-links.search-filter.scrolling-tabs.nav.nav-tabs - if @project - if project_search_tabs?(:blobs) - %li{ class: active_when(@scope == 'blobs') } + %li{ class: active_when(@scope == 'blobs'), data: { qa_selector: 'code_tab' } } = link_to search_filter_path(scope: 'blobs') do = _("Code") %span.badge.badge-pill diff --git a/app/views/search/results/_blob_data.html.haml b/app/views/search/results/_blob_data.html.haml index 143e9f91ca3..36b6ea7bd37 100644 --- a/app/views/search/results/_blob_data.html.haml +++ b/app/views/search/results/_blob_data.html.haml @@ -1,10 +1,10 @@ -.blob-result +.blob-result{ data: { qa_selector: 'result_item_content' } } .file-holder - .js-file-title.file-title + .js-file-title.file-title{ data: { qa_selector: 'file_title_content' } } = link_to blob_link do %i.fa.fa-file %strong = search_blob_title(project, file_name) - if blob.data - .file-content.code.term + .file-content.code.term{ data: { qa_selector: 'file_text_content' } } = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline |