summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--lib/gitlab_keys.rb1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7a93900..7d0c77f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v1.9.6
+ - Explicitly require 'timeout' from the standard library
+
v1.9.5
- Put authorized_keys.lock in the same directory as authorized_keys
- Use lock file when add new entries to authorized_keys
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 52a982b..3bdf6c6 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -1,4 +1,5 @@
require 'tempfile'
+require 'timeout'
require_relative 'gitlab_config'
require_relative 'gitlab_logger'