diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 18:09:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 18:09:06 +0000 |
commit | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (patch) | |
tree | de31671ab7c6ca8c2a3721cbabd1f2a42b3d0194 /Gemfile.lock | |
parent | eabf8fd774fef6a54903e5141138f47bdafeb331 (diff) | |
download | gitlab-ce-b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 08143421c9b..c8912d70810 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1326,7 +1326,7 @@ DEPENDENCIES pry-rails (~> 0.3.9) rack (~> 2.0.7) rack-attack (~> 6.2.0) - rack-cors (~> 1.0.0) + rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rack-timeout |