diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-10 15:46:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-10 15:46:38 +0000 |
| commit | aa7b34bcc6ee76f0b313a1bc793cce1d54805b8d (patch) | |
| tree | 7a7a2051b956cca0bc8ef326e662ad6e874d94b5 | |
| parent | 529880065ecaf4fbcc3bf1f3da6b08908527b997 (diff) | |
| parent | 5cd99d57102678befbb3a831054e0ab566f067d7 (diff) | |
| download | gitlab-shell-aa7b34bcc6ee76f0b313a1bc793cce1d54805b8d.tar.gz | |
Merge branch 'require_timeout' into 'master'
Expliclity require 'timeout' from the stdlib
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/gitlab_keys.rb | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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' |