summaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-01-23 14:30:42 +0100
committerGitHub <noreply@github.com>2018-01-23 14:30:42 +0100
commitd966878e8723dd029b9c5abad3d55e917f78d46f (patch)
tree014f6297f3edf1043d963a16e6b9f8b20c0c07c7 /Gemfile.lock
parent2fc27250769f3bd3c12fb0eb89ed4131aa2ead3b (diff)
Update goldfinger, ostatus2 and http.rb versions (#6337)
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock24
1 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 69ed3097b83..b116318a7c8 100644
--- 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)