Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
3091897b
Commit
3091897b
authored
Jul 28, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Permit concurrent loads in gpg keychain mutex
parent
87f03f01
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
changelogs/unreleased/rails5-gpg-permit-concurrent.yml
changelogs/unreleased/rails5-gpg-permit-concurrent.yml
+5
-0
lib/gitlab/gpg.rb
lib/gitlab/gpg.rb
+10
-2
No files found.
changelogs/unreleased/rails5-gpg-permit-concurrent.yml
0 → 100644
View file @
3091897b
---
title
:
Permit concurrent loads in gpg keychain mutex
merge_request
:
20894
author
:
Jasper Maes
type
:
fixed
lib/gitlab/gpg.rb
View file @
3091897b
...
@@ -71,10 +71,18 @@ module Gitlab
...
@@ -71,10 +71,18 @@ module Gitlab
if
MUTEX
.
locked?
&&
MUTEX
.
owned?
if
MUTEX
.
locked?
&&
MUTEX
.
owned?
optimistic_using_tmp_keychain
(
&
block
)
optimistic_using_tmp_keychain
(
&
block
)
else
else
if
Gitlab
.
rails5?
ActiveSupport
::
Dependencies
.
interlock
.
permit_concurrent_loads
do
MUTEX
.
synchronize
do
MUTEX
.
synchronize
do
optimistic_using_tmp_keychain
(
&
block
)
optimistic_using_tmp_keychain
(
&
block
)
end
end
end
end
else
MUTEX
.
synchronize
do
optimistic_using_tmp_keychain
(
&
block
)
end
end
end
end
end
# 1. Returns the custom home directory if one has been set by calling
# 1. Returns the custom home directory if one has been set by calling
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment