diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-27 09:05:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-27 09:05:56 +0000 |
| commit | cc5d0271c249636bae1de55de9c2bf815d669afa (patch) | |
| tree | 01b5b05c2376fca5a854459460a317c5fef96889 /Gemfile.lock | |
| parent | 529bc7e23ba25fb310c73a3d47759bfdd8b97a0a (diff) | |
| download | gitlab-ce-cc5d0271c249636bae1de55de9c2bf815d669afa.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 134ee9a2c10..d3e98209694 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -734,8 +734,8 @@ GEM rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (4.4.1) - rack + rack-attack (6.2.0) + rack (>= 1.0, < 3) rack-cors (1.0.2) rack-oauth2 (1.9.3) activesupport @@ -1256,7 +1256,7 @@ DEPENDENCIES puma (~> 3.12) puma_worker_killer rack (~> 2.0.7) - rack-attack (~> 4.4.1) + rack-attack (~> 6.2.0) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) |