diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-09 17:52:00 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-09 17:52:00 +0000 |
| commit | 272b60f718c419b97908153a542f1e3fca52e09b (patch) | |
| tree | 4841aa4af4011e8e206c434f4717d2938c12e191 /lib/gitlab_shell.rb | |
| parent | c6577e0d75f51b017f2f332838b97c3ca5b497c0 (diff) | |
| parent | cce62b3571617e2df3aee8df4b3b1908191dc495 (diff) | |
| download | gitlab-shell-272b60f718c419b97908153a542f1e3fca52e09b.tar.gz | |
Merge branch 'fix-ssh-certificate-regressions-8-1' into '8-1-stable'
Fix two regressions in SSH certificate support (8.1)
See merge request gitlab-org/gitlab-shell!226
Diffstat (limited to 'lib/gitlab_shell.rb')
| -rw-r--r-- | lib/gitlab_shell.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 78fdfe8..03edf65 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -208,7 +208,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength begin if defined?(@who) @user = api.discover(@who) - @gl_id = "user-#{@user['id']}" + @gl_id = "user-#{@user['id']}" if @user && @user.key?('id') else @user = api.discover(@gl_id) end |