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:
Jonne Haß 2015-06-04 11:31:43 +02:00
commit e39d024ba1
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

@ -252,7 +252,7 @@ end
group :test do group :test do
# RSpec (unit tests, some integration tests) # RSpec (unit tests, some integration tests)
gem "fixture_builder", "0.3.6" gem "fixture_builder", "0.4.1"
gem "fuubar", "2.0.0" gem "fuubar", "2.0.0"
gem "rspec-instafail", "0.2.6", require: false gem "rspec-instafail", "0.2.6", require: false
gem "test_after_commit", "0.4.1" gem "test_after_commit", "0.4.1"

8
Gemfile.lock
View file

@ -200,7 +200,7 @@ GEM
ffi (1.9.8) ffi (1.9.8)
fission (0.5.0) fission (0.5.0)
CFPropertyList (~> 2.2) CFPropertyList (~> 2.2)
fixture_builder (0.3.6) fixture_builder (0.4.1)
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
fog (1.30.0) fog (1.30.0)
@ -413,7 +413,7 @@ GEM
mime-types (2.5) mime-types (2.5)
mini_magick (4.2.3) mini_magick (4.2.3)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.6.1) minitest (5.7.0)
mobile-fu (1.3.1) mobile-fu (1.3.1)
rack-mobile-detect rack-mobile-detect
rails rails
@ -753,7 +753,7 @@ DEPENDENCIES
faraday (= 0.9.1) faraday (= 0.9.1)
faraday-cookie_jar (= 0.0.6) faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.9.1) faraday_middleware (= 0.9.1)
fixture_builder (= 0.3.6) fixture_builder (= 0.4.1)
fog (= 1.30.0) fog (= 1.30.0)
fuubar (= 2.0.0) fuubar (= 2.0.0)
gon (= 5.2.3) gon (= 5.2.3)
@ -856,4 +856,4 @@ DEPENDENCIES
will_paginate (= 3.0.7) will_paginate (= 3.0.7)
BUNDLED WITH BUNDLED WITH
1.10.2 1.10.3