Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index ce76be9f509..58125f3a831 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -1131,10 +1131,10 @@ RSpec.describe ApplicationController, feature_category: :shared do
       end
     end
 
-    it 'returns a plaintext error response with 429 status' do
+    it 'returns a plaintext error response with 503 status' do
       get :index
 
-      expect(response).to have_gitlab_http_status(:too_many_requests)
+      expect(response).to have_gitlab_http_status(:service_unavailable)
       expect(response.body).to include(
         "Upstream Gitaly has been exhausted: maximum time in concurrency queue reached. Try again later"
       )
diff --git a/spec/controllers/graphql_controller_spec.rb b/spec/controllers/graphql_controller_spec.rb
index 2a16fb1ea37..3f7d25e42da 100644
--- a/spec/controllers/graphql_controller_spec.rb
+++ b/spec/controllers/graphql_controller_spec.rb
@@ -78,7 +78,7 @@ RSpec.describe GraphqlController, feature_category: :integrations do
           a_hash_including('message' => 'Upstream Gitaly has been exhausted. Try again later')
         )
       )
-      expect(response).to have_gitlab_http_status(:too_many_requests)
+      expect(response).to have_gitlab_http_status(:service_unavailable)
       expect(response.headers['Retry-After']).to be(50)
     end
   end