diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-02 12:21:35 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-02 12:21:35 +0000 |
| commit | e0c9c655bb68c09dbc266e3153faf6f2e0db603e (patch) | |
| tree | cf42c93042ca867a54307c4233ff0ab95e6a25a7 /Gemfile.lock | |
| parent | 308348852fec966ddd6bf742ccd0767bc929a1da (diff) | |
| parent | dfb2bc3d26ecbac3b2dcf28e4622e279c416cbbc (diff) | |
| download | gitlab-ce-e0c9c655bb68c09dbc266e3153faf6f2e0db603e.tar.gz | |
Merge branch 'update-rack-attack' into 'master'
Updates rack-attack gem to 4.4.1
See merge request !7186
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 81af1ad2dac..79c828ff0f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -520,7 +520,7 @@ GEM rack (1.6.4) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (4.3.1) + rack-attack (4.4.1) rack rack-cors (0.4.0) rack-mount (0.8.3) @@ -929,7 +929,7 @@ DEPENDENCIES poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) pry-rails (~> 0.3.4) - rack-attack (~> 4.3.1) + rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) rails (= 4.2.7.1) |