summaryrefslogtreecommitdiff
path: root/lib/gitlab_net.rb
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-06-19 16:34:48 -0400
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-06-20 12:15:44 -0400
commitec207719270f5b1c5ccd4c6043f338ca53d45c63 (patch)
treea6fd7430f0c46912bf5e977a1908c46113d58d01 /lib/gitlab_net.rb
parent62af7f6af72728cecb98c5275d8b7aeb3953e564 (diff)
downloadgitlab-shell-ec207719270f5b1c5ccd4c6043f338ca53d45c63.tar.gz
Remove old `project` parameter, use `gl_repository` instead86-follow-up-from-use-gl_repository-if-present-when-enqueing-sidekiq-postreceive-jobs
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r--lib/gitlab_net.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 66e9fd5..faf8680 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_v3}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}"
- url += "&gl_repository=#{URI.escape(gl_repository)}" if gl_repository
+ url = "#{host_v3}/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