summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 17:56:15 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-10 17:56:15 +0200
commit2d59bd09fa58fe37e6a11a8af686b9340a8ed77d (patch)
treeb7e5bf2d9d5533887473bed623589f7d300f60a8
parentfd677db79be3dfa92e77f7a664a65c6aa24607ff (diff)
downloadgitlab-shell-list-ecdsa.tar.gz
Include ecdsa keys in `gitlab_keys list-keys`.list-ecdsa
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rw-r--r--lib/gitlab_keys.rb2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 533f0a0..2b8b166 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.6.2
+ - Include ecdsa keys in `gitlab_keys list-keys`.
+
v2.6.1
- Write errors to stderr to get git to abort and show them as such.
diff --git a/VERSION b/VERSION
index 6a6a3d8..097a15a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.1
+2.6.2
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