deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev' into user_dashboard

Browse source
This commit is contained in:
gitlabhq 2011-11-02 20:59:06 +02:00
commit 83c1194d52
15 changed files with 67 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/mailer_controller.rb
View file

@ -1,4 +1,5 @@
class Admin::MailerController < ApplicationController
layout "admin"
before_filter :authenticate_user!
before_filter :authenticate_admin!

1
app/controllers/admin/projects_controller.rb
View file

@ -1,4 +1,5 @@
class Admin::ProjectsController < ApplicationController
layout "admin"
before_filter :authenticate_user!
before_filter :authenticate_admin!

1
app/controllers/admin/team_members_controller.rb
View file

@ -1,4 +1,5 @@
class Admin::TeamMembersController < ApplicationController
layout "admin"
before_filter :authenticate_user!
before_filter :authenticate_admin!

1
app/controllers/admin/users_controller.rb
View file

@ -1,4 +1,5 @@
class Admin::UsersController < ApplicationController
layout "admin"
before_filter :authenticate_user!
before_filter :authenticate_admin!

1
app/controllers/keys_controller.rb
View file

@ -1,4 +1,5 @@
class KeysController < ApplicationController
layout "profile"
respond_to :js
def index

1
app/controllers/profile_controller.rb
View file

@ -1,4 +1,5 @@
class ProfileController < ApplicationController
layout "profile"
def show
@user = current_user
end