root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2024-02-12 06:10:47 +00:00
parent dc21569d38
commit 53cec2c341
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/development/sidekiq/logging.md
View File

@ -13,7 +13,7 @@ info: Any user with at least the Maintainer role can merge updates to this conte
To have some more information about workers in the logs, we add
[metadata to the jobs in the form of an `ApplicationContext`](../logging.md#logging-context-metadata-through-rails-or-grape-requests).
In most cases, when scheduling a job from a request, this context is already
deducted from the request and added to the scheduled job.
deduced from the request and added to the scheduled job.
When a job runs, the context that was active when it was scheduled
is restored. This causes the context to be propagated to any job

2
lib/gitlab/x509/signature.rb
View File

@ -159,6 +159,8 @@ module Gitlab
key_identifier = get_certificate_extension('authorityKeyIdentifier')
return if key_identifier.nil?
# In an effort to reduce allocations, we mutate below.
# Context: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144252#note_1765403453
key_identifier.gsub!("keyid:", "")
key_identifier.chomp!
key_identifier