logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: d966878e8723dd029b9c5abad3d55e917f78d46f
parent: 2fc27250769f3bd3c12fb0eb89ed4131aa2ead3b
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 23 Jan 2018 14:30:42 +0100

Update goldfinger, ostatus2 and http.rb versions (#6337)


Diffstat:

MGemfile4++--
MGemfile.lock24++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile @@ -32,11 +32,11 @@ gem 'devise', '~> 4.4' gem 'devise-two-factor', '~> 3.0' gem 'doorkeeper', '~> 4.2' gem 'fast_blank', '~> 1.0' -gem 'goldfinger', '~> 2.0' +gem 'goldfinger', '~> 2.1' gem 'hiredis', '~> 0.6' gem 'redis-namespace', '~> 1.5' gem 'htmlentities', '~> 4.3' -gem 'http', '~> 2.2' +gem 'http', '~> 3.0' gem 'http_accept_language', '~> 2.1' gem 'httplog', '~> 0.99' gem 'idn-ruby', require: 'idn' diff --git a/Gemfile.lock b/Gemfile.lock @@ -181,9 +181,9 @@ GEM ruby-progressbar (~> 1.4) globalid (0.4.1) activesupport (>= 4.2.0) - goldfinger (2.0.1) + goldfinger (2.1.0) addressable (~> 2.5) - http (~> 2.2) + http (~> 3.0) nokogiri (~> 1.8) oj (~> 3.0) hamlit (2.8.5) @@ -202,14 +202,14 @@ GEM hiredis (0.6.1) hkdf (0.3.0) htmlentities (4.3.4) - http (2.2.2) + http (3.0.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 1.0.1) + http-form_data (>= 2.0.0.pre.pre2, < 3) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) + http-form_data (2.0.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) httplog (0.99.7) @@ -300,12 +300,12 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) - oj (3.3.9) + oj (3.3.10) orm_adapter (0.5.0) - ostatus2 (2.0.2) - addressable (~> 2.4) - http (~> 2.0) - nokogiri (~> 1.6) + ostatus2 (2.0.3) + addressable (~> 2.5) + http (~> 3.0) + nokogiri (~> 1.8) ox (2.8.2) paperclip (5.1.0) activemodel (>= 4.2.0) @@ -579,11 +579,11 @@ DEPENDENCIES fog-local (~> 0.4) fog-openstack (~> 0.1) fuubar (~> 2.2) - goldfinger (~> 2.0) + goldfinger (~> 2.1) hamlit-rails (~> 0.2) hiredis (~> 0.6) htmlentities (~> 4.3) - http (~> 2.2) + http (~> 3.0) http_accept_language (~> 2.1) httplog (~> 0.99) i18n-tasks (~> 0.9)