diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/gitlab_keys.rb | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +v2.6.4 + - Increase batch_add_keys lock timeout to 300 seconds v2.6.3 - Prevent keys with a very specific comment from accidentally being deleted. diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb index 10f84bd..ca3a816 100644 --- a/lib/gitlab_keys.rb +++ b/lib/gitlab_keys.rb @@ -53,7 +53,7 @@ class GitlabKeys end def batch_add_keys - lock do + lock(300) do # Allow 300 seconds (5 minutes) for batch_add_keys open(auth_file, 'a') do |file| stdin.each_line do |input| tokens = input.strip.split("\t") |