diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 15:08:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 15:08:46 +0000 |
commit | 3f9e1b261121f4dbd045341241f81b47356c99cf (patch) | |
tree | 32be23bd7fda0c3f891182f220f6d0399a1b41dd /app/controllers/application_controller.rb | |
parent | 5ad0cf26551baff8f08af8562a8d45e6ec14d71a (diff) | |
download | gitlab-ce-3f9e1b261121f4dbd045341241f81b47356c99cf.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 60b5d9b6da8..c6d91308123 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -454,6 +454,7 @@ class ApplicationController < ActionController::Base user: -> { auth_user }, project: -> { @project }, namespace: -> { @group }, + caller_id: full_action_name, &block) end @@ -551,6 +552,10 @@ class ApplicationController < ActionController::Base end end + def full_action_name + "#{self.class.name}##{action_name}" + end + # A user requires a role and have the setup_for_company attribute set when they are part of the experimental signup # flow (executed by the Growth team). Users are redirected to the welcome page when their role is required and the # experiment is enabled for the current user. |