diff options
| author | Sanad Liaquat <sliaquat@gitlab.com> | 2019-08-28 08:11:21 +0300 |
|---|---|---|
| committer | Sanad Liaquat <sliaquat@gitlab.com> | 2019-08-28 08:11:21 +0300 |
| commit | 2ad1621c7f7bb7b749f2f4f8d89d84a0f2fbc9f7 (patch) | |
| tree | 8d6f1ecc1a1feadcf00f4515bc3ee75ffd0999a5 /app | |
| parent | d0a7913b3ad6c51284069ae841975fddc1697499 (diff) | |
| parent | 7a162e1a8f1f1aeb45fee149c201115f7a7231c9 (diff) | |
Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'
CE Backport of EE changes
See merge request gitlab-org/gitlab-ce!32203
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/settings/_permissions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 0c8f86c2822..6d06bb246cb 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -14,7 +14,7 @@ .settings-content = render 'groups/settings/general' -%section.settings.gs-permissions.no-animate#js-permissions-settings{ class: ('expanded' if expanded) } +%section.settings.gs-permissions.no-animate#js-permissions-settings{ class: ('expanded' if expanded), data: { qa_selector: 'permission_lfs_2fa_section' } } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } = _('Permissions, LFS, 2FA') diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index 94a938021f9..c55730ccd31 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -31,4 +31,4 @@ = render 'groups/settings/two_factor_auth', f: f = render_if_exists 'groups/member_lock_setting', f: f, group: @group - = f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit' + = f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 48c9f19f89f..c1f4b3adfec 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -147,7 +147,7 @@ = _('Settings') %li.divider.fly-out-top-item = nav_link(path: 'groups#edit') do - = link_to edit_group_path(@group), title: _('General') do + = link_to edit_group_path(@group), title: _('General'), data: { qa_selector: 'general_settings_link' } do %span = _('General') |