From e19ce03a1a785c2cf61d76b535bc6b32e0957606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Wed, 5 Jul 2017 01:33:53 +0000 Subject: Revert "Merge branch 'revert-gl-repository' into 'master'" This reverts merge request !142 --- lib/gitlab_net.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lib/gitlab_net.rb') 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 -- cgit v1.2.1