root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix passign args to original authenticate_user!

This commit is contained in:
Dmitriy Zaporozhets 2015-01-16 18:12:15 -08:00
parent 38600e328b
commit f2eb234c06
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
end end
end end
def authenticate_user! def authenticate_user!(*args)
# If user is not signe-in and tries to access root_path - redirect him to landing page # If user is not signe-in and tries to access root_path - redirect him to landing page
if current_application_settings.home_page_url.present? if current_application_settings.home_page_url.present?
if current_user.nil? && controller_name == 'dashboard' && action_name == 'show' if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base
end end
end end
super super(*args)
end end
def log_exception(exception) def log_exception(exception)