summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-26 11:21:07 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-26 11:21:07 -0600
commit0187c85b780390ee8a119091e98a2bea18a43019 (patch)
treeedabf35e771effd8b589fa0bc8061b3e79947c7d
parent5d185e66271588ee2e6415dd9f30ef912586b4c3 (diff)
downloadgitlab-ce-cs-upgrade-database-cleaner.tar.gz
Upgrade database_cleaner from 1.4.1 to 1.5.3.cs-upgrade-database-cleaner
This includes support for Rails 5 without deprecations warnings. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f2ac74a5976..8e5757eb2db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -275,7 +275,7 @@ group :development, :test do
gem 'awesome_print', '~> 1.2.0', require: false
gem 'fuubar', '~> 2.0.0'
- gem 'database_cleaner', '~> 1.4.0'
+ gem 'database_cleaner', '~> 1.5.0'
gem 'factory_girl_rails', '~> 4.6.0'
gem 'rspec-rails', '~> 3.5.0'
gem 'rspec-retry', '~> 0.4.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index bfa7e38da85..b6379b52f34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
d3_rails (3.5.11)
railties (>= 3.1.0)
daemons (1.2.3)
- database_cleaner (1.4.1)
+ database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
default_value_for (3.0.1)
@@ -841,7 +841,7 @@ DEPENDENCIES
connection_pool (~> 2.0)
creole (~> 0.5.0)
d3_rails (~> 3.5.0)
- database_cleaner (~> 1.4.0)
+ database_cleaner (~> 1.5.0)
default_value_for (~> 3.0.0)
devise (~> 4.0)
devise-two-factor (~> 3.0.0)