summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-08-12 12:03:30 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-08-12 12:03:30 +0200
commitca162699ebaf592f66a3fc5ae78ad94d3c87af3b (patch)
treed3e3e0ac968951cb132e7ff2ccd84c0db8e0d731 /lib/api
parent2c06cf98a6dc982caf81c2e4faba195ece9a3b77 (diff)
parentad3e1edcfce1e24fb9889d5d73852680cf4facf9 (diff)
downloadgitlab-ce-ca162699ebaf592f66a3fc5ae78ad94d3c87af3b.tar.gz
Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slack
# Conflicts: # app/models/ci/pipeline.rb # app/models/commit_status.rb # app/services/ci/create_pipeline_service.rb # spec/models/ci/pipeline_spec.rb
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/internal.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 959b700de78..d8e9ac406c4 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -74,6 +74,10 @@ module API
response
end
+ get "/merge_request_urls" do
+ ::MergeRequests::GetUrlsService.new(project).execute(params[:changes])
+ end
+
#
# Discover user by ssh key
#