Merge branch 'fix-notify-post-receive' into 'master'

Prevent errors from non-functional notify_post_receive endpoint

See merge request !11509

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