diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-13 13:14:35 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-13 13:14:35 +0100 |
| commit | 83f8bf48d91605fa63325b4d4acec717031da025 (patch) | |
| tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /Gemfile.lock | |
| parent | 7ab12b7654f04b2ea71cada9c8f0a41825864939 (diff) | |
| parent | 3287ec8ca3bf8baad6cea0cc497753ff003d2d35 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ec7ac0f5a..44b858947 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -430,7 +430,7 @@ GEM parallel (1.19.1) parallel_tests (2.30.0) parallel - parser (2.6.5.0) + parser (2.7.0.2) ast (~> 2.4.0) parslet (1.8.2) pastel (0.7.3) @@ -462,7 +462,7 @@ GEM pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.0.8) + rack (2.1.1) rack-attack (6.2.2) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -572,7 +572,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.4.0) + rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) |