diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-27 17:26:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 17:26:53 +0100 |
| commit | 67b8af34b3df55ba74a53af731f275d0a4c6d9f8 (patch) | |
| tree | d1f2420e0ea7cea72ea8032ce005c39c36f38a43 /Gemfile.lock | |
| parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
| parent | cf230d551f3081115402f74d4326a2682f27fedc (diff) | |
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 8394b7baa..bfc0d5c55 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.1.1) + rack (2.0.8) rack-attack (6.2.2) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -753,6 +753,7 @@ DEPENDENCIES pry-rails (~> 0.3) puma (~> 4.3) pundit (~> 2.1) + rack (= 2.0.8) rack-attack (~> 6.2) rack-cors (~> 1.1) rails (~> 5.2.4) |