Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2018-01-27 04:30:36 +0300
committerDennis Schubert <mail@dennis-schubert.de>2018-02-02 01:35:35 +0300
commit80bfc3fcfdb16f7d425c82a86e497c14587209fd (patch)
tree9c9596a031d4c65a3d3f477f605d29fec5aff846
parent746ff52256591a2ca81dc26d2aae3724301dd008 (diff)
Bump diaspora_federation
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock26
2 files changed, 16 insertions, 16 deletions
diff --git a/Gemfile b/Gemfile
index 8234f47be..2fa296632 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation
-gem "diaspora_federation-json_schema", "0.2.2"
-gem "diaspora_federation-rails", "0.2.2"
+gem "diaspora_federation-json_schema", "0.2.3"
+gem "diaspora_federation-rails", "0.2.3"
# API and JSON
@@ -292,7 +292,7 @@ group :test do
gem "timecop", "0.9.1"
gem "webmock", "3.0.1", require: false
- gem "diaspora_federation-test", "0.2.2"
+ gem "diaspora_federation-test", "0.2.3"
# Coverage
gem "coveralls", "0.8.21", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 625eff57f..5e8481ab8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,18 +166,18 @@ GEM
devise
rails (>= 3.0.4)
diaspora-prosody-config (0.0.7)
- diaspora_federation (0.2.2)
- faraday (>= 0.9.0, < 0.14.0)
+ diaspora_federation (0.2.3)
+ faraday (>= 0.9.0, < 0.15.0)
faraday_middleware (>= 0.10.0, < 0.13.0)
nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0)
valid (~> 1.0)
- diaspora_federation-json_schema (0.2.2)
- diaspora_federation-rails (0.2.2)
+ diaspora_federation-json_schema (0.2.3)
+ diaspora_federation-rails (0.2.3)
actionpack (>= 4.2, < 6)
- diaspora_federation (= 0.2.2)
- diaspora_federation-test (0.2.2)
- diaspora_federation (= 0.2.2)
+ diaspora_federation (= 0.2.3)
+ diaspora_federation-test (0.2.3)
+ diaspora_federation (= 0.2.3)
fabrication (~> 2.16)
uuid (~> 2.3, >= 2.3.8)
diff-lcs (1.3)
@@ -194,7 +194,7 @@ GEM
rake
et-orbi (1.0.5)
tzinfo
- ethon (0.10.1)
+ ethon (0.11.0)
ffi (>= 1.3.0)
excon (0.59.0)
execjs (2.7.0)
@@ -204,7 +204,7 @@ GEM
sigar (~> 0.7.3)
state_machines
thor
- fabrication (2.16.3)
+ fabrication (2.20.1)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
@@ -783,9 +783,9 @@ DEPENDENCIES
devise (= 4.3.0)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.7)
- diaspora_federation-json_schema (= 0.2.2)
- diaspora_federation-rails (= 0.2.2)
- diaspora_federation-test (= 0.2.2)
+ diaspora_federation-json_schema (= 0.2.3)
+ diaspora_federation-rails (= 0.2.3)
+ diaspora_federation-test (= 0.2.3)
entypo-rails (= 3.0.0)
eye (= 0.9.2)
factory_girl_rails (= 4.8.0)
@@ -904,4 +904,4 @@ DEPENDENCIES
will_paginate (= 3.1.6)
BUNDLED WITH
- 1.15.4
+ 1.16.1