Merge branch 'release-v3.2.0' into stable
Showing
.travis.yml
0 → 100644
... | @@ -9,12 +9,15 @@ gem "rubytree", "~> 0.5.2", :require => 'tree' | ... | @@ -9,12 +9,15 @@ gem "rubytree", "~> 0.5.2", :require => 'tree' |
gem "rdoc", ">= 2.4.2" | gem "rdoc", ">= 2.4.2" | ||
gem "liquid", "~> 2.3.0" | gem "liquid", "~> 2.3.0" | ||
gem "acts-as-taggable-on", "= 2.1.0" | gem "acts-as-taggable-on", "= 2.1.0" | ||
gem 'gravatarify', '~> 3.0.0' | |||
# Needed only on RUBY_VERSION = 1.8, ruby 1.9+ compatible interpreters should bring their csv | # Needed only on RUBY_VERSION = 1.8, ruby 1.9+ compatible interpreters should bring their csv | ||
gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18] | gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18] | ||
gem "tzinfo", "~> 0.3.31" # Fixes #903. Not required for Rails >= 3.2 | gem "tzinfo", "~> 0.3.31" # Fixes #903. Not required for Rails >= 3.2 | ||
group :test do | group :test do | ||
gem 'shoulda', '~> 2.10.3' | gem 'shoulda', '~> 2.10.3' | ||
# Shoulda doesn't work nice on 1.9.3 and seems to need test-unit explicitely… | |||
gem 'test-unit', :platforms => [:mri_19] | |||
gem 'edavis10-object_daddy', :require => 'object_daddy' | gem 'edavis10-object_daddy', :require => 'object_daddy' | ||
gem 'mocha' | gem 'mocha' | ||
gem 'capybara' | gem 'capybara' | ||
... | @@ -52,7 +55,7 @@ end | ... | @@ -52,7 +55,7 @@ end |
# orders of magnitude compared to their native counterparts. You have been | # orders of magnitude compared to their native counterparts. You have been | ||
# warned. | # warned. | ||
platforms :mri, :mingw do | platforms :mri, :mingw, :rbx do | ||
group :mysql2 do | group :mysql2 do | ||
gem "mysql2", "~> 0.2.7" | gem "mysql2", "~> 0.2.7" | ||
end | end | ||
... | @@ -74,7 +77,7 @@ platforms :mri_18, :mingw_18 do | ... | @@ -74,7 +77,7 @@ platforms :mri_18, :mingw_18 do |
end | end | ||
end | end | ||
platforms :mri_19, :mingw_19 do | platforms :mri_19, :mingw_19, :rbx do | ||
group :sqlite do | group :sqlite do | ||
gem "sqlite3" | gem "sqlite3" | ||
end | end | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please
register
or
sign in
to comment