diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-15 12:06:56 +0300 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-16 12:48:41 +0300 |
| commit | 56296f1edadf2bc5f7741cbb3f97cb41f090aac6 (patch) | |
| tree | 5a21667acd7d431f155d12227181dcfc6d21cba8 /lib/gitlab/gpg.rb | |
| parent | 8b4602041cf2c4a8738a4796d78720017249249f (diff) | |
Remove rails4 specific code
Diffstat (limited to 'lib/gitlab/gpg.rb')
| -rw-r--r-- | lib/gitlab/gpg.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/gitlab/gpg.rb b/lib/gitlab/gpg.rb index e53c2d00743..32f61b1d65c 100644 --- a/lib/gitlab/gpg.rb +++ b/lib/gitlab/gpg.rb @@ -73,13 +73,7 @@ module Gitlab if MUTEX.locked? && MUTEX.owned? optimistic_using_tmp_keychain(&block) else - if Gitlab.rails5? - ActiveSupport::Dependencies.interlock.permit_concurrent_loads do - MUTEX.synchronize do - optimistic_using_tmp_keychain(&block) - end - end - else + ActiveSupport::Dependencies.interlock.permit_concurrent_loads do MUTEX.synchronize do optimistic_using_tmp_keychain(&block) end |