Unverified Commit 99c52f05 authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert
Browse files

Bump diaspora_federation

parent f671bebd

Gemfile

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4" 


# Federation



gem "diaspora_federation-rails", "0.1.5"

gem "diaspora_federation-rails", "0.1.7"



# API and JSON
@@ -291,7 +291,7 @@ group :test do 
  gem "webmock",            "2.1.0", require: false

  gem "shoulda-matchers",   "3.1.1"



  gem "diaspora_federation-test", "0.1.5"

  gem "diaspora_federation-test", "0.1.7"



  # Coverage

  gem 'coveralls', require: false

Gemfile.lock

+16 −16
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ GEM 
      activesupport (>= 3.0.0)

      rack (>= 1.1.0)

    addressable (2.4.0)

    arel (6.0.3)

    arel (6.0.4)

    asset_sync (1.1.0)

      activemodel

      fog (>= 1.8.0)
@@ -170,17 +170,17 @@ GEM 
      devise

      rails (>= 3.0.4)

    diaspora-prosody-config (0.0.7)

    diaspora_federation (0.1.5)

      faraday (~> 0.9.0)

    diaspora_federation (0.1.7)

      faraday (>= 0.9.0, < 0.11.0)

      faraday_middleware (~> 0.10.0)

      nokogiri (~> 1.6, >= 1.6.8)

      typhoeus (~> 1.0)

      valid (~> 1.0)

    diaspora_federation-rails (0.1.5)

      diaspora_federation (= 0.1.5)

      rails (~> 4.2)

    diaspora_federation-test (0.1.5)

      diaspora_federation (= 0.1.5)

    diaspora_federation-rails (0.1.7)

      diaspora_federation (= 0.1.7)

      rails (>= 4.2, < 6)

    diaspora_federation-test (0.1.7)

      diaspora_federation (= 0.1.7)

      factory_girl (~> 4.7)

    diff-lcs (1.2.5)

    docile (1.1.5)
@@ -194,7 +194,7 @@ GEM 
      execjs

      multi_json (>= 1.3)

      rake

    ethon (0.9.1)

    ethon (0.10.1)

      ffi (>= 1.3.0)

    excon (0.49.0)

    execjs (2.7.0)
@@ -496,7 +496,7 @@ GEM 
    mimemagic (0.3.1)

    mini_magick (4.5.1)

    mini_portile2 (2.1.0)

    minitest (5.9.1)

    minitest (5.10.1)

    mobile-fu (1.3.1)

      rack-mobile-detect

      rails
@@ -594,7 +594,7 @@ GEM 
      pry (~> 0.10)

    quiet_assets (1.1.0)

      railties (>= 3.1, < 5.0)

    rack (1.6.4)

    rack (1.6.5)

    rack-cors (0.4.0)

    rack-google-analytics (1.2.0)

      actionpack
@@ -675,9 +675,9 @@ GEM 
    rails-assets-underscore (1.8.3)

    rails-deprecated_sanitizer (1.0.3)

      activesupport (>= 4.2.0.alpha)

    rails-dom-testing (1.0.7)

    rails-dom-testing (1.0.8)

      activesupport (>= 4.2.0.beta, < 5.0)

      nokogiri (~> 1.6.0)

      nokogiri (~> 1.6)

      rails-deprecated_sanitizer (>= 1.0.1)

    rails-html-sanitizer (1.0.3)

      loofah (~> 2.0)
@@ -831,7 +831,7 @@ GEM 
      unicode-display_width (~> 1.1.1)

    test_after_commit (1.1.0)

      activerecord (>= 3.2)

    thor (0.19.1)

    thor (0.19.4)

    thread_safe (0.3.5)

    tilt (1.4.1)

    timecop (0.8.1)
@@ -927,8 +927,8 @@ DEPENDENCIES 
  devise (= 4.2.0)

  devise_lastseenable (= 0.0.6)

  diaspora-prosody-config (= 0.0.7)

  diaspora_federation-rails (= 0.1.5)

  diaspora_federation-test (= 0.1.5)

  diaspora_federation-rails (= 0.1.7)

  diaspora_federation-test (= 0.1.7)

  entypo-rails (= 3.0.0.pre.rc2)

  eye (= 0.8.1)

  factory_girl_rails (= 4.7.0)