summaryrefslogtreecommitdiff
path: root/app/controllers/groups_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-30 19:06:18 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-30 19:12:15 +0200
commit26ad250989d82b496b131811f8a0ddd7e662b650 (patch)
treea61059ff97f7d5bb1db163fa2dcb041065b092f2 /app/controllers/groups_controller.rb
parentf2cf6d75ecc6082897543f976e8e4bee7ac24e90 (diff)
downloadgitlab-ce-26ad250989d82b496b131811f8a0ddd7e662b650.tar.gz
Add a page title to every page.
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb13
1 files changed, 2 insertions, 11 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 294af0b1704..66e92abff8d 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -11,9 +11,6 @@ class GroupsController < Groups::ApplicationController
# Load group projects
before_action :load_projects, except: [:new, :create, :projects, :edit, :update]
before_action :event_filter, only: :show
- before_action :set_title, only: [:new, :create]
-
- layout :determine_layout
def new
@group = Group.new
@@ -120,16 +117,10 @@ class GroupsController < Groups::ApplicationController
end
def set_title
- @title = 'New Group'
- end
-
- def determine_layout
if [:new, :create].include?(action_name.to_sym)
- 'navless'
- elsif current_user
- 'group'
+ @title = 'New Group'
else
- 'public_group'
+ super
end
end