diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-09-03 13:16:23 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-03 13:16:23 +0000 |
| commit | 743add978aafa43862867a89b00a04e888199947 (patch) | |
| tree | e2ff2db449f186d5c2dcb9da055d75851af6ab5a /app/views/layouts | |
| parent | c0625e5de1fe491675aadf825fdb9e976f089409 (diff) | |
| download | gitlab-ce-743add978aafa43862867a89b00a04e888199947.tar.gz | |
Move badge settings to general settings
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index d471dd84550..4158bb69452 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -122,12 +122,6 @@ %span = _('General') - = nav_link(controller: :badges) do - = link_to group_settings_badges_path(@group), title: _('Project Badges') do - %span - = _('Project Badges') - - = nav_link(path: 'groups#projects') do = link_to projects_group_path(@group), title: _('Projects') do %span diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 34f47806205..30e0e9fca27 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -313,11 +313,6 @@ %span = _('Members') - if can_edit - = nav_link(controller: :badges) do - = link_to project_settings_badges_path(@project), title: _('Badges') do - %span - = _('Badges') - - if can_edit = nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do = link_to project_settings_integrations_path(@project), title: _('Integrations') do %span |