Commit 0aba3d96 authored by Kamil Trzciński's avatar Kamil Trzciński

Update `rack-timeout` to `0.5.2`

This moves `rack-timeout` to be required
gems, as there's code requiring usage
of `Rack::Timeout`
parent 74af310d
...@@ -164,6 +164,7 @@ gem 'diff_match_patch', '~> 0.1.0' ...@@ -164,6 +164,7 @@ gem 'diff_match_patch', '~> 0.1.0'
# Application server # Application server
gem 'rack', '~> 2.0.9' gem 'rack', '~> 2.0.9'
gem 'rack-timeout', '~> 0.5.1'
group :unicorn do group :unicorn do
gem 'unicorn', '~> 5.5' gem 'unicorn', '~> 5.5'
...@@ -173,7 +174,6 @@ end ...@@ -173,7 +174,6 @@ end
group :puma do group :puma do
gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
gem 'rack-timeout', require: false
end end
# State machine # State machine
......
...@@ -817,7 +817,7 @@ GEM ...@@ -817,7 +817,7 @@ GEM
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-timeout (0.5.1) rack-timeout (0.5.2)
rails (6.0.3.1) rails (6.0.3.1)
actioncable (= 6.0.3.1) actioncable (= 6.0.3.1)
actionmailbox (= 6.0.3.1) actionmailbox (= 6.0.3.1)
...@@ -1350,7 +1350,7 @@ DEPENDENCIES ...@@ -1350,7 +1350,7 @@ DEPENDENCIES
rack-cors (~> 1.0.6) rack-cors (~> 1.0.6)
rack-oauth2 (~> 1.9.3) rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0) rack-proxy (~> 0.6.0)
rack-timeout rack-timeout (~> 0.5.1)
rails (~> 6.0.3.1) rails (~> 6.0.3.1)
rails-controller-testing rails-controller-testing
rails-i18n (~> 6.0) rails-i18n (~> 6.0)
......
---
title: Update `rack-timeout` to `0.5.2`
merge_request: 36071
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment