Unverified Commit 86d52a0d authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert
Browse files

Bump diaspora_federation

parent c89b2ad8

Gemfile

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4" 


# Federation



gem "diaspora_federation-json_schema", "0.2.3"

gem "diaspora_federation-rails", "0.2.3"

gem "diaspora_federation-json_schema", "0.2.4"

gem "diaspora_federation-rails", "0.2.4"



# API and JSON
@@ -294,7 +294,7 @@ group :test do 
  gem "timecop",            "0.9.1"

  gem "webmock",            "3.0.1", require: false



  gem "diaspora_federation-test", "0.2.3"

  gem "diaspora_federation-test", "0.2.4"



  # Coverage

  gem "coveralls", "0.8.21", require: false

Gemfile.lock

+10 −10
Original line number Diff line number Diff line
@@ -166,18 +166,18 @@ GEM 
      devise

      rails (>= 3.0.4)

    diaspora-prosody-config (0.0.7)

    diaspora_federation (0.2.3)

    diaspora_federation (0.2.4)

      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.3)

    diaspora_federation-rails (0.2.3)

    diaspora_federation-json_schema (0.2.4)

    diaspora_federation-rails (0.2.4)

      actionpack (>= 4.2, < 6)

      diaspora_federation (= 0.2.3)

    diaspora_federation-test (0.2.3)

      diaspora_federation (= 0.2.3)

      diaspora_federation (= 0.2.4)

    diaspora_federation-test (0.2.4)

      diaspora_federation (= 0.2.4)

      fabrication (~> 2.16)

      uuid (~> 2.3, >= 2.3.8)

    diff-lcs (1.3)
@@ -217,7 +217,7 @@ GEM 
      http-cookie (~> 1.0.0)

    faraday_middleware (0.12.2)

      faraday (>= 0.7.4, < 1.0)

    ffi (1.9.18)

    ffi (1.9.22)

    fixture_builder (0.5.0)

      activerecord (>= 2)

      activesupport (>= 2)
@@ -785,9 +785,9 @@ DEPENDENCIES 
  devise (= 4.4.1)

  devise_lastseenable (= 0.0.6)

  diaspora-prosody-config (= 0.0.7)

  diaspora_federation-json_schema (= 0.2.3)

  diaspora_federation-rails (= 0.2.3)

  diaspora_federation-test (= 0.2.3)

  diaspora_federation-json_schema (= 0.2.4)

  diaspora_federation-rails (= 0.2.4)

  diaspora_federation-test (= 0.2.4)

  entypo-rails (= 3.0.0)

  eye (= 0.9.2)

  factory_girl_rails (= 4.8.0)