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/controllers/groups_controller.rb | |
| 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
See merge request !1871
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 2e381822e42..901c1cdddcb 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -121,6 +121,8 @@ class GroupsController < Groups::ApplicationController def determine_layout if [:new, :create].include?(action_name.to_sym) 'application' + elsif [:edit, :update, :projects].include?(action_name.to_sym) + 'group_settings' else 'group' end |