diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-20 10:35:00 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-20 10:35:00 +0000 |
| commit | abd74664c486b2aa7f87fb8de7901a4059a32239 (patch) | |
| tree | 49c0b10fa94926d199ddd4a2f15b7ca9ed6aee10 | |
| parent | d685633a833a580ed607faf84cb1398798178acb (diff) | |
| parent | 8d32477884dcbc79ac0dd655ecf2fa27ceb073a8 (diff) | |
| download | gitlab-ce-abd74664c486b2aa7f87fb8de7901a4059a32239.tar.gz | |
Merge branch '44388-update-rack-protection-to-2-0-1' into 'master'
Update rack-protection to 2.0.1
Closes #44388
See merge request gitlab-org/gitlab-ce!17835
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c6c7edb1a0..2c4984d494f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -656,7 +656,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.1) rack rack-proxy (0.6.0) rack diff --git a/changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml b/changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml new file mode 100644 index 00000000000..c21d02d4d87 --- /dev/null +++ b/changelogs/unreleased/44388-update-rack-protection-to-2-0-1.yml @@ -0,0 +1,5 @@ +--- +title: Update rack-protection to 2.0.1 +merge_request: 17835 +author: Takuya Noguchi +type: security |