diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-13 16:28:07 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-13 16:28:07 +0100 |
| commit | bfe2b9cc501205a07628b59b0a38a8643a4ca11c (patch) | |
| tree | 78fa8ee6336dca2719ab0775b81ff98fe34808c6 /Gemfile.lock | |
| parent | 2fe0cb16239ed86016ebea352425862a561b63a2 (diff) | |
| parent | c875f19673e923e7a6e3c2b6656e96b863ca5915 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3737f2299..642c3e158 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,7 @@ GEM brakeman (4.3.1) browser (2.5.3) builder (3.2.3) - bullet (5.8.1) + bullet (5.9.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundler-audit (0.6.0) @@ -361,7 +361,7 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) - oj (3.7.0) + oj (3.7.1) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) @@ -388,7 +388,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.12.1) - parallel_tests (2.26.2) + parallel_tests (2.27.0) parallel parser (2.5.3.0) ast (~> 2.4.0) @@ -596,7 +596,7 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) timers (4.2.0) @@ -660,7 +660,7 @@ DEPENDENCIES bootsnap (~> 1.3) brakeman (~> 4.3) browser - bullet (~> 5.8) + bullet (~> 5.9) bundler-audit (~> 0.6) capistrano (~> 3.11) capistrano-rails (~> 1.4) @@ -718,7 +718,7 @@ DEPENDENCIES ox (~> 2.10) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) - parallel_tests (~> 2.26) + parallel_tests (~> 2.27) pg (~> 1.1) pghero (~> 2.2) pkg-config (~> 1.3) |