Skip to content

Commit

Permalink
Update Travis scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Rodriguez committed Nov 18, 2015
1 parent 9618919 commit e702a27
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion contrib/travis/data/gem_files/rails3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine still uses Rails 3 and Rack 1.4)
gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails3'

if ENV['USE_SVN'] || ENV['REDMINE_VERSION'] == '2.6.7'
if ENV['USE_SVN'] || ENV['REDMINE_VERSION'] == '2.6.8'
gem 'redcarpet', '~> 3.3.2'
else
gem 'redcarpet', '~> 2.3.0'
Expand Down
2 changes: 1 addition & 1 deletion contrib/travis/data/gem_files/rails4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', t
## Ruby/Rack Git Smart-HTTP Server Handler (use our own repository because Redmine uses Rails 4.2 and Rack 1.6)
gem 'gitlab-grack', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_rails4'

if ENV['USE_SVN'] || ['3.1.1', '3.0.5', '2.6.7'].include?(ENV['REDMINE_VERSION'])
if ENV['USE_SVN'] || ['3.1.2', '3.0.6', '2.6.8'].include?(ENV['REDMINE_VERSION'])
gem 'redcarpet', '~> 3.3.2'
else
gem 'redcarpet', '~> 3.1.2'
Expand Down

0 comments on commit e702a27

Please sign in to comment.