diff options
author | Stan Hu <stanhu@gmail.com> | 2017-05-24 00:18:26 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-05-24 00:18:26 +0300 |
commit | a9c1925dbf6cfde9f94cf528decd17aec7d1f2ee (patch) | |
tree | b7edda1eb7f15d5357f9d3fad61b756ca5eb2676 /lib | |
parent | 374aad38ac87d43f5449d518c2f5241c2116199a (diff) | |
parent | de33a5bd535d6f4a1dc6cbdb2bd1b208ab6475e7 (diff) |
Merge branch 'fix-notify-post-receive' into 'master'
Prevent errors from non-functional notify_post_receive endpoint
See merge request !11509
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/internal.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 96aaaf868ea..9ebd4841296 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -136,14 +136,15 @@ module API post "/notify_post_receive" do status 200 - return unless Gitlab::GitalyClient.enabled? - - begin - repository = wiki? ? project.wiki.repository : project.repository - Gitlab::GitalyClient::Notifications.new(repository.raw_repository).post_receive - rescue GRPC::Unavailable => e - render_api_error!(e, 500) - end + # TODO: Re-enable when Gitaly is processing the post-receive notification + # return unless Gitlab::GitalyClient.enabled? + # + # begin + # repository = wiki? ? project.wiki.repository : project.repository + # Gitlab::GitalyClient::Notifications.new(repository.raw_repository).post_receive + # rescue GRPC::Unavailable => e + # render_api_error!(e, 500) + # end end end end |