diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-01 12:51:04 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-01 12:51:04 +0000 |
| commit | 8bf88fba3cbb4837058431ffa5224536513a830d (patch) | |
| tree | 7d552fec736c74d5588cd1a2b3ab4fa901aee2b1 /bin/gitlab-shell-ruby | |
| parent | 3cf936123cda48a8856fb6cd534331f2dabe9e15 (diff) | |
| parent | 05441b826b7dc39b1523123e00bf00ce497ef75d (diff) | |
| download | gitlab-shell-8bf88fba3cbb4837058431ffa5224536513a830d.tar.gz | |
Merge branch 'gitlab-shell-no-glid-argument' into 'master'
Remove mistaken support for `gitlab-shell user-123`
Closes #151
See merge request gitlab-org/gitlab-shell!247
Diffstat (limited to 'bin/gitlab-shell-ruby')
| -rwxr-xr-x | bin/gitlab-shell-ruby | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/gitlab-shell-ruby b/bin/gitlab-shell-ruby index 93a79f6..8d43cf1 100755 --- a/bin/gitlab-shell-ruby +++ b/bin/gitlab-shell-ruby @@ -19,7 +19,7 @@ require File.join(ROOT_PATH, 'lib', 'gitlab_shell') # We must match e.g. "key-12345" anywhere on the command-line. See # https://gitlab.com/gitlab-org/gitlab-shell/issues/145 -who = /\b(?:(?:key|user)-[0-9]+|username-\S+)\b/.match(ARGV.join(' ')).to_s +who = /\b(?:(?:key)-[0-9]+|username-\S+)\b/.match(ARGV.join(' ')).to_s if GitlabShell.new(who).exec(original_cmd) exit 0 |