Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/api/geo.rb b/lib/api/geo.rb
index cb04d2a4e1e..8798b76b52b 100644
--- a/lib/api/geo.rb
+++ b/lib/api/geo.rb
@@ -13,6 +13,13 @@ module API
     end
 
     resource :geo do
+      desc 'Returns a Geo proxy response' do
+        summary "Determine if a Geo site should proxy requests"
+        success code: 200
+        failure [{ code: 403, message: 'Forbidden' }]
+        tags %w[geo]
+      end
+
       # Workhorse calls this to determine if it is a Geo site that should proxy
       # requests. Workhorse doesn't know if it's in a FOSS/EE context.
       get '/proxy' do