summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-10 08:55:08 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-10 08:55:08 -0700
commitf6e74deeacd2b7a61053aebf7f686ef57c7bb0e6 (patch)
tree1cab601aeeb947a909b3d98ac2c65c2a30a4c1ec /lib
parentaec81968b5d92e80b2770050beda8c497eda285a (diff)
parentf0cacf6c371717a887a568eaa5b40685930c6793 (diff)
downloadgitlab-shell-f6e74deeacd2b7a61053aebf7f686ef57c7bb0e6.tar.gz
Merge pull request #58 from encero/master
propably better ssh-key id finding in ARGV
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_shell.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 2d49370..7a9e3df 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -6,7 +6,7 @@ class GitlabShell
attr_accessor :key_id, :repo_name, :git_cmd, :repos_path, :repo_name
def initialize
- @key_id = ARGV.shift
+ @key_id = /key-[0-9]+/.match(ARGV.join).to_s
@origin_cmd = ENV['SSH_ORIGINAL_COMMAND']
@repos_path = GitlabConfig.new.repos_path
end