Merge branch 'master' into remove-references-to-v3-internal-api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index fad06d6..d0bc0bc 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -67,11 +67,13 @@ class GitlabNet
     JSON.parse(resp.body) rescue {}
   end
 
-  def merge_request_urls(gl_repository, repo_path, changes)
+  def merge_request_urls(gl_repository, changes)
     changes = changes.join("\n") unless changes.kind_of?(String)
     changes = changes.encode('UTF-8', 'ASCII', invalid: :replace, replace: '')
-    url = "#{host}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}"
-    url += "&gl_repository=#{URI.escape(gl_repository)}" if gl_repository
+    url = "#{host}/merge_request_urls?" \
+      "gl_repository=#{URI.escape(gl_repository)}&" \
+      "changes=#{URI.escape(changes)}"
+
     resp = get(url)
     JSON.parse(resp.body) rescue []
   end
@@ -96,9 +98,8 @@ class GitlabNet
     {}
   end
 
-  def notify_post_receive(gl_repository, repo_path)
-    params = { gl_repository: gl_repository, project: repo_path }
-    resp = post("#{host}/notify_post_receive", params)
+  def notify_post_receive(gl_repository)
+    resp = post("#{host}/notify_post_receive", gl_repository: gl_repository)
 
     resp.code == '200'
   rescue