diff options
author | Stan Hu <stanhu@gmail.com> | 2017-09-05 11:33:09 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-09-05 11:33:09 -0700 |
commit | 41e5ec8f74d9909050d54ae957b09a812a398c8e (patch) | |
tree | 8d07352840703d1421e53c2e8a595cd4da049842 /lib/api/internal.rb | |
parent | f045903541ace5cf4fd3c6e4a05ecfd264c1c621 (diff) | |
parent | 685066cd0e4bb9c2279c1ed43ae445d07c963743 (diff) | |
download | gitlab-ce-41e5ec8f74d9909050d54ae957b09a812a398c8e.tar.gz |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r-- | lib/api/internal.rb | 17 |
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 |