diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-08-15 19:52:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-08-15 19:52:42 +0000 |
| commit | 122d84a403d3534dea743d94aa23d4115cc804a8 (patch) | |
| tree | 19aeec667ec591c02d498910fbe1526d19770643 /lib/gitlab_shell.rb | |
| parent | 02457041814fe4497b3df00e0e45edbee107c823 (diff) | |
| parent | 1666dfdae141cceab35cc30baa253e2676b5ed65 (diff) | |
| download | gitlab-shell-122d84a403d3534dea743d94aa23d4115cc804a8.tar.gz | |
Merge branch '148-merge-8-1-1-to-master' into 'master'
Resolve "gitlab-shell 8.1.1 not on master"
Closes #148 and #145
See merge request gitlab-org/gitlab-shell!230
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 2057ea9..11494e0 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -210,7 +210,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 |