diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 13:53:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 13:53:23 +0000 |
| commit | 291bed5526d27cef072a58fe2da9a22b2c8b258c (patch) | |
| tree | 7f28b8751f44b9e8653e6515e271fa01f582cc36 /lib/gitlab_keys.rb | |
| parent | 7354e1b89b8303620549254b86a46159a329b583 (diff) | |
| parent | 2d59bd09fa58fe37e6a11a8af686b9340a8ed77d (diff) | |
| download | gitlab-shell-291bed5526d27cef072a58fe2da9a22b2c8b258c.tar.gz | |
Merge branch 'list-ecdsa' into 'master'
Include ecdsa keys in `gitlab_keys list-keys`.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/31.
See merge request !12
Diffstat (limited to 'lib/gitlab_keys.rb')
| -rw-r--r-- | lib/gitlab_keys.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb index 100e164..1ed0ab3 100644 --- a/lib/gitlab_keys.rb +++ b/lib/gitlab_keys.rb @@ -46,7 +46,7 @@ class GitlabKeys # key_id & public_key # command=".../bin/gitlab-shell key-741" ... ssh-rsa AAAAB3NzaDAxx2E\n # ^^^^^^^ ^^^^^^^^^^^^^^^ - matches = /^command=\".+?\s+(.+?)\".+?ssh-rsa\s(.+)\s*.*\n*$/.match(line) + matches = /^command=\".+?\s+(.+?)\".+?(?:ssh|ecdsa)-.*?\s(.+)\s*.*\n*$/.match(line) keys << "#{matches[1]} #{matches[2]}\n" unless matches.nil? end keys |