summaryrefslogtreecommitdiff
path: root/lib/api/internal.rb
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2017-09-01 09:21:18 +0200
committerMarin Jankovski <maxlazio@gmail.com>2017-09-01 09:21:18 +0200
commit28060caa0ade7566a38e3ed17f2db8bf9116dc1b (patch)
tree3886373472541059bf04cd95dbc4595189f0d600 /lib/api/internal.rb
parent7d38df306c73af354286cecb24b19155e537797b (diff)
parent6f96ccaa7dd53a7462b86a0ebe8af66afde86aa2 (diff)
downloadgitlab-ce-28060caa0ade7566a38e3ed17f2db8bf9116dc1b.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r--lib/api/internal.rb17
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 8b007869dc3..622bd9650e4 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -68,7 +68,7 @@ module API
end
get "/merge_request_urls" do
- ::MergeRequests::GetUrlsService.new(project).execute(params[:changes])
+ merge_request_urls
end
#
@@ -155,6 +155,21 @@ module API
# render_api_error!(e, 500)
# end
end
+
+ post '/post_receive' do
+ status 200
+
+ PostReceive.perform_async(params[:gl_repository], params[:identifier],
+ params[:changes])
+ broadcast_message = BroadcastMessage.current&.last&.message
+ reference_counter_decreased = Gitlab::ReferenceCounter.new(params[:gl_repository]).decrease
+
+ {
+ merge_request_urls: merge_request_urls,
+ broadcast_message: broadcast_message,
+ reference_counter_decreased: reference_counter_decreased
+ }
+ end
end
end
end