Merged rails-4.1 branch (#14534).
git-svn-id: https://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Showing
.travis.run-test.sh
0 → 100644
source 'https://rubygems.org' | ||
gem "rails", "3.2.19" | ||
gem "rails", "4.1.6" | ||
gem "jquery-rails", "~> 3.1.1" | ||
gem "coderay", "~> 1.1.0" | ||
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] | ||
gem "builder", ">= 3.0.4" | ||
gem "request_store", "1.0.5" | ||
gem "mime-types" | ||
gem "awesome_nested_set", "3.0.0" | ||
gem "protected_attributes" | ||
gem "actionpack-action_caching" | ||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem | ||
gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby] | ||
gem "rbpdf", "~> 1.18.1" | ||
# Optional gem for LDAP authentication | ||
... | ... | @@ -23,16 +28,12 @@ end |
platforms :mri, :mingw do | ||
# Optional gem for exporting the gantt to a PNG file, not supported with jruby | ||
group :rmagick do | ||
# RMagick 2 supports ruby 1.9 | ||
# RMagick 1 would be fine for ruby 1.8 but Bundler does not support | ||
# different requirements for the same gem on different platforms | ||
gem "rmagick", ">= 2.0.0" | ||
end | ||
# Optional Markdown support, not for JRuby | ||
group :markdown do | ||
# TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped | ||
gem "redcarpet", "~> 2.3.0" | ||
gem "redcarpet", "~> 3.1.2" | ||
end | ||
end | ||
... | ... | @@ -57,7 +58,6 @@ if File.exist?(database_file) |
gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw] | ||
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby | ||
when 'mysql' | ||
gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] | ||
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby | ||
when /postgresql/ | ||
gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw] | ||
... | ... | @@ -85,24 +85,20 @@ group :development do |
end | ||
group :test do | ||
gem "shoulda", "~> 3.3.2" | ||
gem "shoulda-matchers", "1.4.1" | ||
gem "minitest" | ||
gem "shoulda-context" | ||
gem "mocha", "~> 1.0.0", :require => 'mocha/api' | ||
if RUBY_VERSION >= '1.9.3' | ||
gem "capybara", "~> 2.1.0" | ||
gem "selenium-webdriver" | ||
end | ||
# For running UI tests | ||
gem "capybara", "~> 2.1.0" | ||
gem "selenium-webdriver" | ||
end | ||
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") | ||
if File.exists?(local_gemfile) | ||
puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` | ||
instance_eval File.read(local_gemfile) | ||
eval_gemfile local_gemfile | ||
end | ||
# Load plugins' Gemfiles | ||
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| | ||
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v` | ||
#TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4) | ||
instance_eval File.read(file), file | ||
eval_gemfile file | ||
end |