summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorNicolas <nicolas@gitlab.com>2015-06-16 00:32:14 +0200
committerNicolas <nicolas@gitlab.com>2015-06-24 18:05:16 +0200
commita521e88fc065242b61becbe101ced908e7dadfbd (patch)
tree4f8d3a0de26b5f9fe6f617ea5d656decf11310da /app/controllers
parentc465af093096990ee42b3021fce157d02b8864cb (diff)
downloadgitlab-ce-a521e88fc065242b61becbe101ced908e7dadfbd.tar.gz
Fix consistency issue in sidebars of Project and Group Settings.
Fixes #2277.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups_controller.rb2
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