diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-25 23:26:15 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-25 23:26:15 -0700 |
| commit | 02c7da2e484478a88825f2350a391c13773944ab (patch) | |
| tree | df2c5bd5b379e727a65fedcc70da92b38c51e7af | |
| parent | 30185044bf831069b346a58b2b717b0f45a63f86 (diff) | |
| parent | 6ec6fa7882995222ffebb7ec4c83c9f9812bc30a (diff) | |
| download | gitlab-shell-02c7da2e484478a88825f2350a391c13773944ab.tar.gz | |
Merge pull request #26 from regru/do_not_fall_on_deploy_keys
Do not fall on discover deployment keys. Closes #25
| -rw-r--r-- | lib/gitlab_net.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab_shell.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 0b99706..d47209e 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -22,7 +22,7 @@ class GitlabNet def discover(key) key_id = key.gsub("key-", "") resp = get("#{host}/discover?key_id=#{key_id}") - JSON.parse(resp.body) + JSON.parse(resp.body) rescue nil end def check diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 842714e..abc5ac2 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -26,7 +26,7 @@ class GitlabShell end else user = api.discover(@key_id) - puts "Welcome to GitLab, #{user['name']}!" + puts "Welcome to GitLab, #{user && user['name'] || 'Anonymous'}!" end end |