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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2017-03-02 12:48:53 +01:00
commit 1a14061e38
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -288,7 +288,7 @@ group :test do
gem "factory_girl_rails", "4.7.0" gem "factory_girl_rails", "4.7.0"
gem "timecop", "0.8.1" gem "timecop", "0.8.1"
gem "webmock", "2.1.0", require: false gem "webmock", "2.3.2", require: false
gem "shoulda-matchers", "3.1.1" gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.1.7" gem "diaspora_federation-test", "0.1.7"

8
Gemfile.lock
View file

@ -289,7 +289,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
sprockets (>= 2.0.0) sprockets (>= 2.0.0)
tilt (>= 1.2) tilt (>= 1.2)
hashdiff (0.3.0) hashdiff (0.3.2)
hashie (3.4.4) hashie (3.4.4)
hike (1.2.3) hike (1.2.3)
hitimes (1.2.4) hitimes (1.2.4)
@ -769,7 +769,7 @@ GEM
activesupport activesupport
httpclient (>= 2.4) httpclient (>= 2.4)
multi_json multi_json
webmock (2.1.0) webmock (2.3.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
@ -920,8 +920,8 @@ DEPENDENCIES
unicorn-worker-killer (= 0.4.4) unicorn-worker-killer (= 0.4.4)
uuid (= 2.3.8) uuid (= 2.3.8)
versionist (= 1.5.0) versionist (= 1.5.0)
webmock (= 2.1.0) webmock (= 2.3.2)
will_paginate (= 3.1.5) will_paginate (= 3.1.5)
BUNDLED WITH BUNDLED WITH
1.13.7 1.14.5