diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /lib/tasks/ci.rake | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/tasks/ci.rake')
| -rw-r--r-- | lib/tasks/ci.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 41a334c5e..857cc232d 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -33,7 +33,7 @@ namespace :ci do else Rake::Task["test"].invoke end - # Rake::Task["test:ui"].invoke if RUBY_VERSION >= '1.9.3' + # Rake::Task["test:ui"].invoke end desc "Finish the build" @@ -52,7 +52,7 @@ file 'config/database.yml' do case database when 'mysql' - dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), + dev_conf = {'adapter' => 'mysql2', 'database' => dev_db_name, 'host' => 'localhost', 'encoding' => 'utf8'} if ENV['RUN_ON_NOT_OFFICIAL'] |