summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-01-17 03:34:40 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-01-17 03:34:40 +0000
commitacc3366827ea5ad8ddcf872fabaefc94b97f0d9f (patch)
tree8895e9ba26e3412f8820a7df37d8d84d99dcb930 /app/controllers/application_controller.rb
parentada6c6080b2fa0d63003f8b29b5c32195254906d (diff)
parentf2eb234c068ccb57f100080a499d307b9b2f5502 (diff)
downloadgitlab-ce-acc3366827ea5ad8ddcf872fabaefc94b97f0d9f.tar.gz
Merge branch 'configure-home-page' into 'master'
Allow to specify home page for non logged-in users See merge request !1404
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b83de68c5d2..6da4f91c3f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -48,6 +48,17 @@ class ApplicationController < ActionController::Base
end
end
+ 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'
+ redirect_to current_application_settings.home_page_url and return
+ end
+ end
+
+ super(*args)
+ end
+
def log_exception(exception)
application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
application_trace.map!{ |t| " #{t}\n" }