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 /lib/gitlab/gitaly_client.rb | |
parent | 23e66f03108f811dbb6f9aa4fc463f888666522d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index f4a89edecd1..e3788814dd5 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -215,7 +215,7 @@ module Gitlab 'client_name' => CLIENT_NAME } - context_data = Gitlab::ApplicationContext.current + context_data = Labkit::Context.current&.to_h feature_stack = Thread.current[:gitaly_feature_stack] feature = feature_stack && feature_stack[0] |