diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-11 18:23:29 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-11 18:23:29 +0000 |
commit | a40268352c811762d9e70e869d5157c01107c1a5 (patch) | |
tree | c9016c4fc6c26a748799f3fe05faedc44e7bfdd7 /lib/gitlab_net.rb | |
parent | 1e3d15a71ed49a932c6539d1e783b5948f31192e (diff) | |
parent | 9ba4a0aa4fc104189873134644a2d5da28f5b4b7 (diff) | |
download | gitlab-shell-a40268352c811762d9e70e869d5157c01107c1a5.tar.gz |
Merge branch 'feature/new-merge-request-url' into 'master'
Show Merge request link after pushing if new brach
This is part of implementation for issue https://gitlab.com/gitlab-org/gitlab-ce/issues/18266
See merge request !77
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r-- | lib/gitlab_net.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index e10a07a..c06ed1e 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -54,6 +54,13 @@ class GitlabNet JSON.parse(resp.body) rescue {} end + def merge_request_urls(repo_name, changes) + changes = changes.join("\n") unless changes.kind_of?(String) + changes = changes.encode('UTF-8', 'ASCII', invalid: :replace, replace: '') + resp = get("#{host}/merge_request_urls?project=#{URI.escape(repo_name)}&changes=#{URI.escape(changes)}") + JSON.parse(resp.body) rescue [] + end + def check get("#{host}/check", read_timeout: CHECK_TIMEOUT) end |