diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-13 20:28:19 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-13 20:28:19 +0300 |
| commit | 7b7ba297cf64f4e5ea27234600c038c3b2fc0a6d (patch) | |
| tree | ae184b442e69495bd615f1e24ddced1d0b2f2f1e /app | |
| parent | 61b0577d918748e6957d63e10cd33219756d48d7 (diff) | |
| parent | 7fe92d998125d3dc8be3544346de8dbd5c64b240 (diff) | |
Merge branch 'bvl-missing-message-on-access-denied' into 'master'
Render access denied without message
Closes #47844
See merge request gitlab-org/gitlab-ce!19755
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/errors/access_denied.html.haml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 041837c5410..56312f801fb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -284,8 +284,10 @@ class ApplicationController < ActionController::Base return unless current_user return if current_user.terms_accepted? + message = _("Please accept the Terms of Service before continuing.") + if sessionless_user? - render_403 + access_denied!(message) else # Redirect to the destination if the request is a get. # Redirect to the source if it was a post, so the user can re-submit after @@ -296,7 +298,7 @@ class ApplicationController < ActionController::Base URI(request.referer).path if request.referer end - flash[:notice] = _("Please accept the Terms of Service before continuing.") + flash[:notice] = message redirect_to terms_path(redirect: redirect_path), status: :found end end diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml index 227c7884915..8ae29b9d337 100644 --- a/app/views/errors/access_denied.html.haml +++ b/app/views/errors/access_denied.html.haml @@ -1,4 +1,4 @@ -- message = local_assigns.fetch(:message) +- message = local_assigns.fetch(:message, nil) - content_for(:title, 'Access Denied') = image_tag('illustrations/error-403.svg', alt: '403', lazy: false) |