logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: dd23ae031f7dc7ea6054e0f81d0e676fd24aeafc
parent: 51f2eca8877d8c56a19e1b8ce4edf407c2d236fb
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Mon,  4 Dec 2017 00:55:27 +0900

Update dependencies for Ruby (2017-12-03) (#5878)

* Update active_model_serializers to version 0.10.7

* Update capistrano-rails to version 1.3.1

* Update capistrano-rbenv to version 2.1.3

* Update capybara to version 2.16.1

* Update devise-two-factor to version 3.0.2

* Update i18n-tasks to version 0.8.19

* Update ox to version 2.8.2

* Update parallel_tests to version 2.19.0

* Update puma to version 3.11.0

* Update redis-namespace to version 1.6.0

* Update rspec-rails to version 3.7.2

* Update scss_lint to version 0.56.0

* Update webmock to version 3.1.1

* Update webpush to version 0.3.3

* bundle update

Diffstat:

MGemfile.lock87+++++++++++++++++++++++++++++++++++++++++++------------------------------------
1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock @@ -24,11 +24,11 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.6) + active_model_serializers (0.10.7) actionpack (>= 4.1, < 6) activemodel (>= 4.1, < 6) case_transform (>= 0.2) - jsonapi-renderer (>= 0.1.1.beta1, < 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.3) active_record_query_trace (1.5.4) activejob (5.1.4) activesupport (= 5.1.4) @@ -83,15 +83,15 @@ GEM capistrano-bundler (1.3.0) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.3.0) + capistrano-rails (1.3.1) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.1.2) + capistrano-rbenv (2.1.3) capistrano (~> 3.1) sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (2.15.4) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -113,7 +113,7 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.2) + crass (1.0.3) debug_inspector (0.0.3) devise (4.3.0) bcrypt (~> 3.0) @@ -121,11 +121,11 @@ GEM railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport + devise-two-factor (3.0.2) + activesupport (< 5.2) attr_encrypted (>= 1.3, < 4, != 2) devise (~> 4.0) - railties + railties (< 5.2) rotp (~> 2.0) diff-lcs (1.3) docile (1.1.5) @@ -184,7 +184,7 @@ GEM http (~> 2.2) nokogiri (~> 1.8) oj (~> 3.0) - hamlit (2.8.4) + hamlit (2.8.5) temple (>= 0.8.0) thor tilt @@ -196,7 +196,7 @@ GEM hamster (3.0.0) concurrent-ruby (~> 1.0) hashdiff (0.3.7) - highline (1.7.8) + highline (1.7.10) hiredis (0.6.1) hkdf (0.3.0) htmlentities (4.3.4) @@ -213,9 +213,9 @@ GEM httplog (0.99.7) colorize rack - i18n (0.9.0) + i18n (0.9.1) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.18) + i18n-tasks (0.9.19) activesupport (>= 4.0.2) ast (>= 2.1.0) easy_translate (>= 0.5.0) @@ -236,8 +236,8 @@ GEM json-ld (~> 2.1, >= 2.1.5) multi_json (~> 1.11) rdf (~> 2.2) - jsonapi-renderer (0.1.3) - jwt (1.5.6) + jsonapi-renderer (0.2.0) + jwt (2.1.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -267,8 +267,8 @@ GEM loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mario-redis-lock (1.2.0) redis (~> 3, >= 3.0.5) method_source (0.9.0) @@ -279,7 +279,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) msgpack (1.1.0) @@ -305,7 +305,7 @@ GEM http (~> 2.0) nokogiri (~> 1.6) openssl (~> 2.0) - ox (2.8.1) + ox (2.8.2) paperclip (5.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -316,22 +316,22 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.12.0) - parallel_tests (2.17.0) + parallel_tests (2.19.0) parallel - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) pg (0.21.0) pghero (1.7.0) activerecord pkg-config (1.2.8) powerpack (0.1.1) - pry (0.11.2) + pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.0.0) - puma (3.10.0) + public_suffix (3.0.1) + puma (3.11.0) pundit (1.1.0) activesupport (>= 3.0.0) rabl (0.13.1) @@ -344,7 +344,7 @@ GEM rack rack-proxy (0.6.2) rack - rack-test (0.7.0) + rack-test (0.8.2) rack (>= 1.0, < 3) rack-timeout (0.4.2) rails (5.1.4) @@ -381,8 +381,11 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.2.1) - rdf (2.2.11) + rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rdf (2.2.12) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.3.2) @@ -395,8 +398,8 @@ GEM redis-activesupport (5.0.4) activesupport (>= 3, < 6) redis-store (>= 1.3, < 2) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) + redis-namespace (1.6.0) + redis (>= 3.0.4) redis-rack (2.0.3) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) @@ -421,7 +424,7 @@ GEM rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) - rspec-rails (3.7.1) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -449,10 +452,14 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.25) - scss_lint (0.55.0) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + scss_lint (0.56.0) rake (>= 0.9, < 13) - sass (~> 3.4.20) + sass (~> 3.5.3) sidekiq (5.0.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) @@ -486,7 +493,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.14.0) + sshkit (1.15.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) statsd-ruby (1.2.1) @@ -514,7 +521,7 @@ GEM uniform_notifier (1.10.0) warden (1.2.7) rack (>= 1.0) - webmock (3.1.0) + webmock (3.1.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -522,12 +529,12 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - webpush (0.3.2) + webpush (0.3.3) hkdf (~> 0.2) - jwt + jwt (~> 2.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) xpath (2.1.0) nokogiri (~> 1.3) @@ -638,4 +645,4 @@ RUBY VERSION ruby 2.4.2p198 BUNDLED WITH - 1.15.4 + 1.16.0