Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-21 16:11:04 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-21 16:11:04 +0400
commitbe817c53c6fcf946bc149b2e603e3809e79d9d36 (patch)
tree48b3148fd9b5b29653495071184dc549c16c8c7e
parentcce14e0b0133ec6e8f380a23a6309bb52e67cc20 (diff)
Update database cleaner. Remove postgres from travis build list since it gives us deadlocks always
-rw-r--r--.travis.yml1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
3 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 6d39488df27..a1d0d49da4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
language: ruby
env:
- - DB=postgresql
- DB=mysql
before_install:
- sudo apt-get install libicu-dev -y
diff --git a/Gemfile b/Gemfile
index ec200e17333..daba4c6c203 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,7 +139,7 @@ group :development, :test do
gem "capybara", '2.0.2'
gem "pry"
gem "awesome_print"
- gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git"
+ gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git"
gem "launchy"
gem 'factory_girl_rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 93187cd565b..f414ca9f04b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/bmabey/database_cleaner.git
- revision: f89c34300e114be99532f14c115b2799a3380ac6
- ref: f89c34300e114be99532f14c115b2799a3380ac6
+ revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
+ ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
specs:
database_cleaner (0.9.1)