logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 17ba6620048042761dd88b608c8d01ebdb42dc4b
parent: db4119f9711e6c2ac640325640f6e61b1e177ed3
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Fri, 19 May 2017 10:22:10 -0400

Gem updates without rails five one (#3137)

* Update terminal-table to version 1.8.0

* Update aws-sdk to version 2.9.20

* Update cld3 to version 3.1.2

* Update microformats2 to version 3.1.0

* Update rails-controller-testing to version 1.0.2

* Update oj to version 3.0.8

* Update http-form_data to version 1.0.3

* Update nokogumbo to version 1.4.11

* Update simplecov-html to version 0.10.1

* Update aws-sdk to version 2.9.21

* Update oj to version 3.0.9

* Update sass to version 3.4.24

* Update simple_form to version 3.5.0

Diffstat:

MGemfile.lock42+++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock @@ -52,13 +52,13 @@ GEM encryptor (~> 3.0.0) av (0.9.0) cocaine (~> 0.5.3) - aws-sdk (2.9.17) - aws-sdk-resources (= 2.9.17) - aws-sdk-core (2.9.17) + aws-sdk (2.9.21) + aws-sdk-resources (= 2.9.21) + aws-sdk-core (2.9.21) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.17) - aws-sdk-core (= 2.9.17) + aws-sdk-resources (2.9.21) + aws-sdk-core (= 2.9.21) aws-sigv4 (1.0.0) bcrypt (3.1.11) better_errors (2.1.1) @@ -99,7 +99,7 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) chunky_png (1.3.8) - cld3 (3.1.1) + cld3 (3.1.2) ffi (>= 1.1.0, < 1.10.0) climate_control (0.2.0) cocaine (0.5.8) @@ -177,7 +177,7 @@ GEM http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.2) + http-form_data (1.0.3) http_accept_language (2.1.0) http_parser.rb (0.6.0) httplog (0.99.3) @@ -226,7 +226,7 @@ GEM mail (2.6.5) mime-types (>= 1.16, < 4) method_source (0.8.2) - microformats2 (3.0.1) + microformats2 (3.1.0) json nokogiri mime-types (3.1) @@ -242,9 +242,9 @@ GEM nio4r (2.0.0) nokogiri (1.7.2) mini_portile2 (~> 2.1.0) - nokogumbo (1.4.10) + nokogumbo (1.4.11) nokogiri - oj (3.0.7) + oj (3.0.9) openssl (2.0.3) orm_adapter (0.5.0) ostatus2 (2.0.0) @@ -303,9 +303,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 5.0.3) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) + rails-controller-testing (1.0.2) + actionpack (~> 5.x, >= 5.0.1) + actionview (~> 5.x, >= 5.0.1) activesupport (~> 5.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -386,7 +386,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.23) + sass (3.4.24) scss_lint (0.53.0) rake (>= 0.9, < 13) sass (~> 3.4.20) @@ -405,14 +405,14 @@ GEM thor (~> 0) simple-navigation (4.0.5) activesupport (>= 2.3.2) - simple_form (3.4.0) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) + simple_form (3.5.0) + actionpack (> 4, < 5.2) + activemodel (> 4, < 5.2) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) slop (3.6.0) sprockets (3.7.1) concurrent-ruby (~> 1.0) @@ -426,8 +426,8 @@ GEM net-ssh (>= 2.8.0) statsd-instrument (2.1.2) temple (0.8.0) - terminal-table (1.7.3) - unicode-display_width (~> 1.1.1) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) thor (0.19.4) thread (0.2.2) thread_safe (0.3.6) @@ -443,7 +443,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.4) - unicode-display_width (1.1.3) + unicode-display_width (1.2.1) uniform_notifier (1.10.0) warden (1.2.7) rack (>= 1.0)