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:
Benjamin Neff 2018-08-24 19:49:37 +02:00
commit 76c64ec1f8
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -278,7 +278,7 @@ end
group :test do
# RSpec (unit tests, some integration tests)
gem "fixture_builder", "0.5.1"
gem "fixture_builder", "0.5.2.rc3"
gem "fuubar", "2.3.1"
gem "json-schema-rspec", "0.0.4"
gem "rspec-json_expectations", "~> 2.1"

7
Gemfile.lock
View file

@ -222,9 +222,10 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.23)
fixture_builder (0.5.1)
fixture_builder (0.5.2.rc3)
activerecord (>= 2)
activesupport (>= 2)
hashdiff
fog-aws (2.0.1)
fog-core (~> 1.38)
fog-json (~> 1.0)
@ -804,7 +805,7 @@ DEPENDENCIES
faraday (= 0.12.2)
faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.12.2)
fixture_builder (= 0.5.1)
fixture_builder (= 0.5.2.rc3)
fog-aws (= 2.0.1)
fuubar (= 2.3.1)
gon (= 6.2.0)
@ -921,4 +922,4 @@ DEPENDENCIES
will_paginate (= 3.1.6)
BUNDLED WITH
1.16.2
1.16.4