Merge branch 'batch-add-keys-timeout'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 3 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 90bd21d..56917cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 v2.6.4
   - Remove keys from authorized_keys in-place
+  - 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 a8baf45..3710f96 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -52,7 +52,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")