Merge branch 'master' into pre_count_on_sequel

This commit is contained in:
Kostas Karachalios 2014-12-05 12:50:38 +01:00
commit 87d25d99c4
2 changed files with 8 additions and 8 deletions

14
Gemfile
View File

@ -14,19 +14,19 @@ group :development, :test do
#ORM's
gem "activerecord"
gem "datamapper"
gem "dm-migrations"
gem "dm-sqlite-adapter"
gem "dm-migrations"
gem "dm-sqlite-adapter"
gem "mongoid"
gem "tzinfo"
gem "mongo_ext"
gem "bson_ext"
gem "mongoid-tree"
gem "tzinfo"
gem "mongo_ext"
gem "bson_ext"
gem "mongoid-tree"
gem "mongo_mapper"
gem "moped"
gem "couch_potato"
gem "sequel", "~>3.21.0"
gem "sequel", "~> 3.21.0"
#gem "ibm_db" # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
gem 'mysql', '~> 2.8.1'
gem 'mysql2'

View File

@ -7,7 +7,7 @@ Each strategy is a small amount of code but is code that is usually needed in an
ActiveRecord, DataMapper, Sequel, MongoMapper, Mongoid, CouchPotato, Ohm and Redis are supported.
[![Build Status](https://secure.travis-ci.org/bmabey/database_cleaner.png)](http://travis-ci.org/bmabey/database_cleaner)
[![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner)
Here is an overview of the strategies supported for each library: