Merge branch 'revert-c0d64fc8' into 'master'

Revert "Merge branch 'update-rack-timeout' into 'master'"

See merge request gitlab-org/gitlab!36229

Gemfile

@@ -164,7 +164,6 @@ gem 'diff_match_patch', '~> 0.1.0'
 
 # Application server
 gem 'rack', '~> 2.0.9'
-gem 'rack-timeout', '~> 0.5.1'
 
 group :unicorn do
   gem 'unicorn', '~> 5.5'
@@ -174,6 +173,7 @@ end
 group :puma do
   gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
   gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
+  gem 'rack-timeout', require: false
 end
 
 # State machine

Gemfile.lock

@@ -817,7 +817,7 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rack-timeout (0.5.2)
+    rack-timeout (0.5.1)
     rails (6.0.3.1)
       actioncable (= 6.0.3.1)
       actionmailbox (= 6.0.3.1)
@@ -1350,7 +1350,7 @@ DEPENDENCIES
   rack-cors (~> 1.0.6)
   rack-oauth2 (~> 1.9.3)
   rack-proxy (~> 0.6.0)
-  rack-timeout (~> 0.5.1)
+  rack-timeout
   rails (~> 6.0.3.1)
   rails-controller-testing
   rails-i18n (~> 6.0)

changelogs/unreleased/update-rack-timeout.yml

----
-title: Update `rack-timeout` to `0.5.2`
-merge_request: 36071
-author:
-type: changed