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/layouts | |
| 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/layouts')
| -rw-r--r-- | app/views/layouts/_search.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 9cac8266eaf..bc900992cb0 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -13,7 +13,8 @@ tabindex: '1', autocomplete: 'off', data: { issues_path: issues_dashboard_path, - mr_path: merge_requests_dashboard_path }, + mr_path: merge_requests_dashboard_path, + qa_selector: 'search_term_field' }, aria: { label: _('Search or jump to…') } %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } } .dropdown-menu.dropdown-select.js-dashboard-search-options diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 87133c7ba22..cb39c830170 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -236,7 +236,7 @@ %span = _('General') = nav_link(path: 'application_settings#integrations') do - = link_to integrations_admin_application_settings_path, title: _('Integrations') do + = link_to integrations_admin_application_settings_path, title: _('Integrations'), data: { qa_selector: 'integration_settings_link' } do %span = _('Integrations') = nav_link(path: 'application_settings#repository') do |