summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-29 08:55:57 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-29 08:55:57 -0800
commit08582f153249d91d361977d7968126a420739a8b (patch)
treeb8b7149876bd0c24000b8cf953b42cedef0eb896 /app/controllers/users_controller.rb
parent1f0e16569f1924ed967bff9f4f78bbee874251db (diff)
downloadgitlab-ce-08582f153249d91d361977d7968126a420739a8b.tar.gz
Improve user calendar authentification and tests
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c96f67a2a4..ff5e31067fb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,6 @@
class UsersController < ApplicationController
+ skip_before_filter :authenticate_user!
+ before_filter :set_user
layout :determine_layout
def show
@@ -47,7 +49,7 @@ class UsersController < ApplicationController
private
- def authenticate_user!
+ def set_user
@user = User.find_by_username!(params[:username])
unless current_user || @user.public_profile?