Merge branch 'pb-remove-gitlab-keys' into 'master'

Remove gitlab-keys script

See merge request gitlab-org/gitlab-shell!329

2 files changed, 0 insertions, 37 deletions

diff --git a/bin/check b/bin/check
index 2acee63..6d42f9b 100755
--- a/bin/check
+++ b/bin/check
@@ -29,14 +29,4 @@ rescue GitlabNet::ApiUnreachableError
   abort "FAILED: Failed to connect to internal API"
 end
 
-config = GitlabConfig.new
-
-abort("ERROR: missing option in config.yml") unless config.auth_file
-
-print "Access to #{config.auth_file}: "
-if system(File.dirname(__FILE__) + '/gitlab-keys', 'check-permissions')
-  print 'OK'
-else
-  abort "FAILED"
-end
 puts "\n"
diff --git a/bin/gitlab-keys b/bin/gitlab-keys
deleted file mode 100755
index 9eb1950..0000000
--- a/bin/gitlab-keys
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/gitlab_init'
-
-#
-# GitLab Keys shell. Add/remove keys from ~/.ssh/authorized_keys
-#
-# Ex.
-#   /bin/gitlab-keys add-key key-782 "ssh-rsa AAAAx321..."
-#
-#   printf "key-782\tssh-rsa AAAAx321...\n" | /bin/gitlab-keys batch-add-keys
-#
-#   /bin/gitlab-keys rm-key key-23 "ssh-rsa AAAAx321..."
-#
-#   /bin/gitlab-keys list-keys
-#   
-#   /bin/gitlab-keys clear
-#
-
-require File.join(ROOT_PATH, 'lib', 'gitlab_keys')
-
-# Return non-zero if command execution was not successful
-if GitlabKeys.new.exec
-  exit 0
-else
-  exit 1
-end