diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-09 18:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-09 18:08:59 +0300 |
| commit | 6f2b1c32f3ccf422575f591b42372534502dcd72 (patch) | |
| tree | 2ed532687d73e290f07c760825c02a2ecbaa5416 /lib/gitlab/gitaly_client.rb | |
| parent | b90d8b54a4d623e52cf1d4318023e3b18d13dd5b (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 e3788814dd5..f4a89edecd1 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 = Labkit::Context.current&.to_h + context_data = Gitlab::ApplicationContext.current feature_stack = Thread.current[:gitaly_feature_stack] feature = feature_stack && feature_stack[0] |