summaryrefslogtreecommitdiff
path: root/app/views/groups/edit.html.haml
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-09-03 13:16:23 +0000
committerPhil Hughes <me@iamphill.com>2018-09-03 13:16:23 +0000
commit743add978aafa43862867a89b00a04e888199947 (patch)
treee2ff2db449f186d5c2dcb9da055d75851af6ab5a /app/views/groups/edit.html.haml
parentc0625e5de1fe491675aadf825fdb9e976f089409 (diff)
downloadgitlab-ce-743add978aafa43862867a89b00a04e888199947.tar.gz
Move badge settings to general settings
Diffstat (limited to 'app/views/groups/edit.html.haml')
-rw-r--r--app/views/groups/edit.html.haml12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index cae2df4699e..fc17dd2d310 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -25,6 +25,18 @@
.settings-content
= render 'groups/settings/permissions'
+%section.settings.no-animate{ class: ('expanded' if expanded) }
+ .settings-header
+ %h4
+ = s_('GroupSettings|Badges')
+ %button.btn.js-settings-toggle{ type: 'button' }
+ = expanded ? 'Collapse' : 'Expand'
+ %p
+ = s_('GroupSettings|Customize your group badges.')
+ = link_to s_('GroupSettings|Learn more about badges.'), help_page_path('user/project/badges')
+ .settings-content
+ = render 'shared/badges/badge_settings'
+
%section.settings.gs-advanced.no-animate#js-advanced-settings{ class: ('expanded' if expanded) }
.settings-header
%h4