Merge branch 'require_timeout' into 'master'

Expliclity require 'timeout' from the stdlib

Merge branch 'require_timeout' into 'master'
Expliclity require 'timeout' from the stdlib
aa7b34bc · Dmitriy Zaporozhets · 52988006 · 5cd99d57 · aa7b34bc · aa7b34bc
Commit aa7b34bc authored Jun 10, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CHANGELOG CHANGELOG +3 -0

lib/gitlab_keys.rb lib/gitlab_keys.rb +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+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

--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
 require 'tempfile'
+require 'timeout'
 require_relative 'gitlab_config'
 require_relative 'gitlab_logger'