diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-11 15:07:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-11 15:07:49 +0000 |
commit | 90184b64bb3412cfd291b45c8997671cdb1ca95a (patch) | |
tree | 49accc148b0fa776d8a60c9e3a9224231b7ca393 /Gemfile.lock | |
parent | bac547dc784170c7d0e6a5ae14d0ff5d549c31ee (diff) | |
download | gitlab-ce-90184b64bb3412cfd291b45c8997671cdb1ca95a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 989502e40a1..13e1e4ac828 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -770,7 +770,8 @@ GEM rack (>= 0.4) rack-attack (6.2.0) rack (>= 1.0, < 3) - rack-cors (1.0.2) + rack-cors (1.0.6) + rack (>= 1.6.0) rack-oauth2 (1.9.3) activesupport attr_required |