summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-16 18:12:15 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-16 18:12:15 -0800
commitf2eb234c068ccb57f100080a499d307b9b2f5502 (patch)
tree8895e9ba26e3412f8820a7df37d8d84d99dcb930 /app/controllers/application_controller.rb
parent38600e328bf4bacf2d3e4288943fb7652ee6c674 (diff)
downloadgitlab-ce-f2eb234c068ccb57f100080a499d307b9b2f5502.tar.gz
Fix passign args to original authenticate_user!
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4780a7a2a9a..6da4f91c3f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
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 current_application_settings.home_page_url.present?
if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
@@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base
end
end
- super
+ super(*args)
end
def log_exception(exception)