nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-01-24 07:09:12 +01:00
commit 541e053ddb
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -12,7 +12,7 @@ gem "unicorn", "5.0.1", require: false
# Federation # Federation
gem "diaspora_federation-rails", "0.0.11" gem "diaspora_federation-rails", "0.0.12"
# API and JSON # API and JSON
@ -291,7 +291,7 @@ group :test do
gem "webmock", "1.22.3", require: false gem "webmock", "1.22.3", require: false
gem "shoulda-matchers", "3.0.1" gem "shoulda-matchers", "3.0.1"
gem "diaspora_federation-test", "0.0.11" gem "diaspora_federation-test", "0.0.12"
end end
group :development, :test do group :development, :test do

12
Gemfile.lock
View file

@ -158,17 +158,17 @@ GEM
eventmachine (~> 1.0.8) eventmachine (~> 1.0.8)
http_parser.rb (~> 0.6) http_parser.rb (~> 0.6)
nokogiri (~> 1.6) nokogiri (~> 1.6)
diaspora_federation (0.0.11) diaspora_federation (0.0.12)
faraday (~> 0.9.0) faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0) faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.7.1) nokogiri (~> 1.6, >= 1.6.7.1)
typhoeus (~> 0.7) typhoeus (~> 0.7)
valid (~> 1.0) valid (~> 1.0)
diaspora_federation-rails (0.0.11) diaspora_federation-rails (0.0.12)
diaspora_federation (= 0.0.11) diaspora_federation (= 0.0.12)
rails (~> 4.2) rails (~> 4.2)
diaspora_federation-test (0.0.11) diaspora_federation-test (0.0.12)
diaspora_federation (= 0.0.11) diaspora_federation (= 0.0.12)
factory_girl (~> 4.5, >= 4.5.0) factory_girl (~> 4.5, >= 4.5.0)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
@ -897,6 +897,8 @@ DEPENDENCIES
diaspora-vines (~> 0.2.0.develop) diaspora-vines (~> 0.2.0.develop)
diaspora_federation-rails (= 0.0.11) diaspora_federation-rails (= 0.0.11)
diaspora_federation-test (= 0.0.11) diaspora_federation-test (= 0.0.11)
diaspora_federation-rails (= 0.0.12)
diaspora_federation-test (= 0.0.12)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7) eye (= 0.7)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)