From d868491d85aecafc0fb22119d6c3eb38ede13262 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 12 Jul 2017 09:39:27 +0100
Subject: Handle internal API errors when getting merge request URLs

---
 lib/gitlab_net.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/gitlab_net.rb')

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
-- 
cgit v1.2.1