diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 03:09:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 03:09:16 +0300 |
| commit | 2e31c85a97183814ffa7ba5cc58f7bbad668fb2b (patch) | |
| tree | 18be488a2381014d05dd0323228d00c153251a0f /app/controllers/application_controller.rb | |
| parent | 154b9bae142ba15fec753f44327654595094b879 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3c03c387dba..c5c586ea489 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -35,8 +35,9 @@ class ApplicationController < ActionController::Base before_action :check_impersonation_availability before_action :required_signup_info + prepend_around_action :set_current_context + around_action :sessionless_bypass_admin_mode!, if: :sessionless_user? - around_action :set_current_context around_action :set_locale around_action :set_session_storage around_action :set_current_admin |