diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-03 15:46:10 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-03 15:46:10 +0000 |
commit | 274738391b23cb13f0c1be7a6d061a6909beb7a0 (patch) | |
tree | 0ca63a9650864bd6310488876d09fde8024512b5 /app/views | |
parent | ca9ef52a33257863d5c941b2ef0b94f5285fcbb4 (diff) | |
parent | 1ee06e30890a54e5112133967ea750429875c40b (diff) | |
download | gitlab-ce-274738391b23cb13f0c1be7a6d061a6909beb7a0.tar.gz |
Merge branch 'qa-257-group-saml-sso' into 'master'
Add element classes used in ee branch qa-257-group-saml-sso
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22074
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 43170587797..4aa22138498 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -10,7 +10,7 @@ = group_icon(@group, class: "avatar s40 avatar-tile") .sidebar-context-title = @group.name - %ul.sidebar-top-level-items + %ul.sidebar-top-level-items.qa-group-sidebar - if group_sidebar_link?(:overview) = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do = link_to group_path(@group) do @@ -109,9 +109,9 @@ = link_to edit_group_path(@group) do .nav-icon-container = sprite_icon('settings') - %span.nav-item-name.qa-settings-item + %span.nav-item-name.qa-group-settings-item = _('Settings') - %ul.sidebar-sub-level-items + %ul.sidebar-sub-level-items.qa-group-sidebar-submenu = nav_link(path: %w[groups#projects groups#edit badges#index ci_cd#show], html_options: { class: "fly-out-top-item" } ) do = link_to edit_group_path(@group) do %strong.fly-out-top-item-name |