diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-10 06:09:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-10 06:09:10 +0300 |
| commit | 5d756f9966c2f91b96cef7e552693e5bd1f1fb21 (patch) | |
| tree | 4edd5c50411c21c57867d57a776e6c8a67d6f247 /app/controllers | |
| parent | 23e66f03108f811dbb6f9aa4fc463f888666522d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 99fab68d24c..379da90827a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -463,7 +463,7 @@ class ApplicationController < ActionController::Base feature_category: feature_category) do yield ensure - @current_context = Gitlab::ApplicationContext.current + @current_context = Labkit::Context.current.to_h end end |