Skip to content

Commit e702a27

Browse files
author
Nicolas Rodriguez
committed
Update Travis scripts
1 parent 9618919 commit e702a27

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contrib/travis/data/gem_files/rails3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
77
## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine still uses Rails 3 and Rack 1.4)
88
gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails3'
99

10-
if ENV['USE_SVN'] || ENV['REDMINE_VERSION'] == '2.6.7'
10+
if ENV['USE_SVN'] || ENV['REDMINE_VERSION'] == '2.6.8'
1111
gem 'redcarpet', '~> 3.3.2'
1212
else
1313
gem 'redcarpet', '~> 2.3.0'

contrib/travis/data/gem_files/rails4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
77
## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine uses Rails 4.2 and Rack 1.6)
88
gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails4'
99

10-
if ENV['USE_SVN'] || ['3.1.1', '3.0.5', '2.6.7'].include?(ENV['REDMINE_VERSION'])
10+
if ENV['USE_SVN'] || ['3.1.2', '3.0.6', '2.6.8'].include?(ENV['REDMINE_VERSION'])
1111
gem 'redcarpet', '~> 3.3.2'
1212
else
1313
gem 'redcarpet', '~> 3.1.2'

0 commit comments

Comments
 (0)