logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 005f1fd360ada23c6e35c6cc1fd06b7a4fe28c41
parent: 8d4e7504b16a4a33ec7ba5fa5edf3dcaf7669318
Author: yhirano <yhirano@me.com>
Date:   Thu,  4 May 2017 04:28:29 +0900

update gems (#2754)


Diffstat:

MGemfile.lock61+++++++++++++++++++++++++++++++------------------------------
1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock @@ -43,22 +43,22 @@ GEM public_suffix (~> 2.0, >= 2.0.2) airbrussh (1.2.0) sshkit (>= 1.6.1, != 1.7.0) - annotate (2.6.5) - activerecord (>= 2.3.0) - rake (>= 0.8.7) + annotate (2.7.1) + activerecord (>= 3.2, < 6.0) + rake (>= 10.4, < 12.0) arel (7.1.4) ast (2.3.0) attr_encrypted (3.0.3) encryptor (~> 3.0.0) av (0.9.0) cocaine (~> 0.5.3) - aws-sdk (2.9.12) - aws-sdk-resources (= 2.9.12) - aws-sdk-core (2.9.12) + aws-sdk (2.9.14) + aws-sdk-resources (= 2.9.14) + aws-sdk-core (2.9.14) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.12) - aws-sdk-core (= 2.9.12) + aws-sdk-resources (2.9.14) + aws-sdk-core (= 2.9.14) aws-sigv4 (1.0.0) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -94,7 +94,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -140,10 +140,10 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (4.2.5) railties (>= 4.2) - dotenv (2.2.0) - dotenv-rails (2.2.0) - dotenv (= 2.2.0) - railties (>= 3.2, < 5.1) + dotenv (2.2.1) + dotenv-rails (2.2.1) + dotenv (= 2.2.1) + railties (>= 3.2, < 5.2) easy_translate (0.5.0) json thread @@ -174,7 +174,7 @@ GEM activesupport (>= 4.0.1) hamlit (>= 1.2.0) railties (>= 4.0.1) - hashdiff (0.3.2) + hashdiff (0.3.4) highline (1.7.8) hiredis (0.6.1) htmlentities (4.3.4) @@ -192,7 +192,7 @@ GEM colorize rack i18n (0.8.1) - i18n-tasks (0.9.13) + i18n-tasks (0.9.15) activesupport (>= 4.0.2) ast (>= 2.1.0) easy_translate (>= 0.5.0) @@ -227,10 +227,10 @@ GEM link_header (0.0.8) local_time (1.0.3) coffee-rails - lograge (0.4.1) - actionpack (>= 4, < 5.1) - activesupport (>= 4, < 5.1) - railties (>= 4, < 5.1) + lograge (0.5.0) + actionpack (>= 4, <= 5.1.0) + activesupport (>= 4, <= 5.1.0) + railties (>= 4, <= 5.1.0) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.5) @@ -255,7 +255,7 @@ GEM mini_portile2 (~> 2.1.0) nokogumbo (1.4.10) nokogiri - oj (3.0.2) + oj (3.0.5) openssl (2.0.3) orm_adapter (0.5.0) ostatus2 (1.1.0) @@ -279,7 +279,7 @@ GEM parser (2.4.0.0) ast (~> 2.2) pg (0.20.0) - pghero (1.6.5) + pghero (1.7.0) activerecord pkg-config (1.2.0) powerpack (0.1.1) @@ -341,7 +341,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.0.0) + rake (11.3.0) react-rails (2.1.0) babel-transpiler (>= 0.7.0) connection_pool @@ -365,8 +365,9 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.3.0) redis (>= 2.2) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rotp (2.1.2) rqrcode (0.10.1) chunky_png (~> 1.0) @@ -386,7 +387,7 @@ GEM rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) - rspec-sidekiq (3.0.0) + rspec-sidekiq (3.0.1) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.5.0) @@ -403,14 +404,14 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sidekiq (4.2.10) + sidekiq (5.0.0) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) - sidekiq-unique-jobs (5.0.0) - sidekiq (>= 4.0) - thor + redis (~> 3.3, >= 3.3.3) + sidekiq-unique-jobs (5.0.7) + sidekiq (>= 4.0, <= 6.0) + thor (~> 0) simple-navigation (4.0.5) activesupport (>= 2.3.2) simple_form (3.4.0)