Commit aa7b34bc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'require_timeout' into 'master'

Expliclity require 'timeout' from the stdlib
parents 52988006 5cd99d57
v1.9.6
- Explicitly require 'timeout' from the standard library
v1.9.5 v1.9.5
- Put authorized_keys.lock in the same directory as authorized_keys - Put authorized_keys.lock in the same directory as authorized_keys
- Use lock file when add new entries to authorized_keys - Use lock file when add new entries to authorized_keys
......
require 'tempfile' require 'tempfile'
require 'timeout'
require_relative 'gitlab_config' require_relative 'gitlab_config'
require_relative 'gitlab_logger' require_relative 'gitlab_logger'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment