diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-07 21:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-07 21:09:13 +0000 |
| commit | e49bd57279b72cf517853aec369e341fa3442d60 (patch) | |
| tree | 91b544f03a49c1aa7d1d072f30226031f841cfb0 /Gemfile.lock | |
| parent | 139d707cfeb007f3cf30f39a38deb0eec6817a47 (diff) | |
| download | gitlab-ce-e49bd57279b72cf517853aec369e341fa3442d60.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f68fd455352..70f2dfafe3a 100644 --- a/Gemfile.lock +++ b/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) |