diff options
author | Sean McGivern <sean@gitlab.com> | 2017-07-12 09:39:27 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2017-07-12 09:39:27 +0100 |
commit | d868491d85aecafc0fb22119d6c3eb38ede13262 (patch) | |
tree | 0c26ace01485779e21df499f04dc8effc97f6463 /lib | |
parent | 53df36f24c1d660d00298e05c78d34468af7db1d (diff) | |
download | gitlab-shell-d868491d85aecafc0fb22119d6c3eb38ede13262.tar.gz |
Handle internal API errors when getting merge request URLsonly-parse-mr-urls-on-success
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab_net.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index fad06d6..4c938b1 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -73,7 +73,14 @@ class GitlabNet url = "#{host}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}" url += "&gl_repository=#{URI.escape(gl_repository)}" if gl_repository resp = get(url) - JSON.parse(resp.body) rescue [] + + if resp.code == '200' + JSON.parse(resp.body) + else + [] + end + rescue + [] end def check |