parent
5714e83ab2
commit
8a3c9a2463
2 changed files with 23 additions and 23 deletions
8
Gemfile
8
Gemfile
|
|
@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.5"
|
|||
|
||||
# Federation
|
||||
|
||||
gem "diaspora_federation-json_schema", "0.2.6"
|
||||
gem "diaspora_federation-rails", "0.2.6"
|
||||
gem "diaspora_federation-json_schema", "0.2.7"
|
||||
gem "diaspora_federation-rails", "0.2.7"
|
||||
|
||||
# API and JSON
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ gem "acts-as-taggable-on", "8.1.0"
|
|||
# URIs and HTTP
|
||||
|
||||
gem "addressable", "2.7.0", require: "addressable/uri"
|
||||
gem "faraday", "0.15.4"
|
||||
gem "faraday", "0.17.4"
|
||||
gem "faraday_middleware", "0.13.1"
|
||||
gem "faraday-cookie_jar", "0.0.6"
|
||||
gem "typhoeus", "1.4.0"
|
||||
|
|
@ -286,7 +286,7 @@ group :test do
|
|||
gem "timecop", "0.9.4"
|
||||
gem "webmock", "3.13.0", require: false
|
||||
|
||||
gem "diaspora_federation-test", "0.2.6"
|
||||
gem "diaspora_federation-test", "0.2.7"
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
|
|
|
|||
38
Gemfile.lock
38
Gemfile.lock
|
|
@ -205,18 +205,18 @@ GEM
|
|||
devise
|
||||
rails (>= 3.0.4)
|
||||
diaspora-prosody-config (0.0.7)
|
||||
diaspora_federation (0.2.6)
|
||||
faraday (>= 0.9.0, < 0.16.0)
|
||||
faraday_middleware (>= 0.10.0, < 0.14.0)
|
||||
diaspora_federation (0.2.7)
|
||||
faraday (>= 0.9.0, < 1.0)
|
||||
faraday_middleware (>= 0.10.0, < 1.0)
|
||||
nokogiri (~> 1.6, >= 1.6.8)
|
||||
typhoeus (~> 1.0)
|
||||
valid (~> 1.0)
|
||||
diaspora_federation-json_schema (0.2.6)
|
||||
diaspora_federation-rails (0.2.6)
|
||||
diaspora_federation-json_schema (0.2.7)
|
||||
diaspora_federation-rails (0.2.7)
|
||||
actionpack (>= 4.2, < 6)
|
||||
diaspora_federation (= 0.2.6)
|
||||
diaspora_federation-test (0.2.6)
|
||||
diaspora_federation (= 0.2.6)
|
||||
diaspora_federation (= 0.2.7)
|
||||
diaspora_federation-test (0.2.7)
|
||||
diaspora_federation (= 0.2.7)
|
||||
fabrication (~> 2.16)
|
||||
uuid (~> 2.3, >= 2.3.8)
|
||||
diff-lcs (1.4.4)
|
||||
|
|
@ -234,8 +234,8 @@ GEM
|
|||
rake
|
||||
et-orbi (1.2.4)
|
||||
tzinfo
|
||||
ethon (0.12.0)
|
||||
ffi (>= 1.3.0)
|
||||
ethon (0.15.0)
|
||||
ffi (>= 1.15.0)
|
||||
excon (0.82.0)
|
||||
execjs (2.8.1)
|
||||
eye (0.10.0)
|
||||
|
|
@ -250,14 +250,14 @@ GEM
|
|||
factory_girl_rails (4.9.0)
|
||||
factory_girl (~> 4.9.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.15.4)
|
||||
faraday (0.17.4)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-cookie_jar (0.0.6)
|
||||
faraday (>= 0.7.4)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday_middleware (0.13.1)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
ffi (1.15.3)
|
||||
ffi (1.15.4)
|
||||
ffi-compiler (1.0.1)
|
||||
ffi (>= 1.0.0)
|
||||
rake
|
||||
|
|
@ -389,7 +389,7 @@ GEM
|
|||
multi_json (~> 1.14)
|
||||
logging-rails (0.6.0)
|
||||
logging (>= 1.8)
|
||||
loofah (2.10.0)
|
||||
loofah (2.12.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
macaddr (1.7.2)
|
||||
|
|
@ -503,7 +503,7 @@ GEM
|
|||
pry (~> 0.10)
|
||||
public_suffix (4.0.6)
|
||||
raabro (1.4.0)
|
||||
racc (1.5.2)
|
||||
racc (1.6.0)
|
||||
rack (2.2.3)
|
||||
rack-cors (1.1.1)
|
||||
rack (>= 2.0.0)
|
||||
|
|
@ -591,7 +591,7 @@ GEM
|
|||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
rails-i18n (5.1.3)
|
||||
i18n (>= 0.7, < 2)
|
||||
|
|
@ -818,13 +818,13 @@ DEPENDENCIES
|
|||
devise-two-factor (= 4.0.0)
|
||||
devise_lastseenable (= 0.0.6)
|
||||
diaspora-prosody-config (= 0.0.7)
|
||||
diaspora_federation-json_schema (= 0.2.6)
|
||||
diaspora_federation-rails (= 0.2.6)
|
||||
diaspora_federation-test (= 0.2.6)
|
||||
diaspora_federation-json_schema (= 0.2.7)
|
||||
diaspora_federation-rails (= 0.2.7)
|
||||
diaspora_federation-test (= 0.2.7)
|
||||
entypo-rails (= 3.0.0)
|
||||
eye (= 0.10.0)
|
||||
factory_girl_rails (= 4.9.0)
|
||||
faraday (= 0.15.4)
|
||||
faraday (= 0.17.4)
|
||||
faraday-cookie_jar (= 0.0.6)
|
||||
faraday_middleware (= 0.13.1)
|
||||
fixture_builder (= 0.5.2)
|
||||
|
|
|
|||
Loading…
Reference in a new issue