diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-25 18:05:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 18:05:52 +0100 |
| commit | 9ee8e1add9f937a75c2514ca88958ff02cf5573c (patch) | |
| tree | e6c97dfd5a14860b9c825b1c84fb1dd84ada6581 /Gemfile.lock | |
| parent | 0d41fef50618e3d58255b4f4082326e83ff06982 (diff) | |
| parent | 2f2b48b227304d0f0a28dd4867e84af10b8097ad (diff) | |
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 da12e38c0..c33b4fb89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -442,7 +442,7 @@ GEM pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.1.2) + rack (2.2.2) rack-attack (6.2.2) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -751,7 +751,7 @@ DEPENDENCIES pry-rails (~> 0.3) puma (~> 4.3) pundit (~> 2.1) - rack (~> 2.1.2) + rack (~> 2.2.2) rack-attack (~> 6.2) rack-cors (~> 1.1) rails (~> 5.2.4) |