diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-28 19:15:03 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-28 19:15:03 +0100 |
| commit | 44744e3ce14938b4cc826d1d8612aaa7095aa3ef (patch) | |
| tree | 6e95e682138ff39de8e558d56c78d6b814e8ae05 /Gemfile.lock | |
| parent | 67b8af34b3df55ba74a53af731f275d0a4c6d9f8 (diff) | |
| parent | 1051de0165e6e6555e8d27b90bb622cb0c4908b2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 bfc0d5c55..8e211aab4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -443,7 +443,7 @@ GEM pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.0.8) + rack (2.1.2) rack-attack (6.2.2) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -753,7 +753,7 @@ DEPENDENCIES pry-rails (~> 0.3) puma (~> 4.3) pundit (~> 2.1) - rack (= 2.0.8) + rack (~> 2.1.2) rack-attack (~> 6.2) rack-cors (~> 1.1) rails (~> 5.2.4) |