diff options
author | Stan Hu <stanhu@gmail.com> | 2017-05-24 00:18:26 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-24 07:26:30 +0300 |
commit | f50598f704817115927ea478bd1a4138bd66edb5 (patch) | |
tree | f19c54480bbdb0d4e5be839659074eb3ac5c5bfe /lib | |
parent | dae8838057114bb76c73acf050a5053024f724cb (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 2a11790b215..2971887770b 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 |