diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-07-01 09:32:41 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-07-01 09:32:41 +0000 |
commit | 690aafebdb96b01d585fedf6a3ba7be0d8adbf67 (patch) | |
tree | 87d8efe43f85a25c975ab12bb49d252a45964ef0 /app/helpers | |
parent | b096374dd50226b96f96203f3a02780c40c4502a (diff) | |
parent | a521e88fc065242b61becbe101ced908e7dadfbd (diff) | |
download | gitlab-ce-690aafebdb96b01d585fedf6a3ba7be0d8adbf67.tar.gz |
Merge branch 'group_settings_nav' into 'master'
Fix consistency issue in sidebars of Project and Group Settings.
Fixes #2277
![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png)
See merge request !1871
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/groups_helper.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 3569ac2af63..b067cb54a43 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -19,14 +19,6 @@ module GroupsHelper end end - def group_settings_page? - if current_controller?('groups') - current_action?('edit') || current_action?('projects') - else - false - end - end - def group_icon(group) if group.is_a?(String) group = Group.find_by(path: group) |