diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-09-14 17:07:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 17:07:36 -0300 |
| commit | 4269f71f59e936e8d7ff126bbae660c6c3410fd1 (patch) | |
| tree | e4a0db02ff32650f7d168f134075e9d20fe5377a /Gemfile | |
| parent | 65b62f652ca564c3904e2d32d25e079090f3c78c (diff) | |
| parent | f8e2fe4320bdc1f2c06dc77391239937b7fc9e68 (diff) | |
| download | rails-4269f71f59e936e8d7ff126bbae660c6c3410fd1.tar.gz rails-4269f71f59e936e8d7ff126bbae660c6c3410fd1.tar.bz2 rails-4269f71f59e936e8d7ff126bbae660c6c3410fd1.zip | |
Merge pull request #26495 from johnnyshields/fix-3-2-specs
[WIP] Fix tests for 3-2-stable
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 27 |
1 files changed, 23 insertions, 4 deletions
@@ -9,7 +9,12 @@ else end gem 'bcrypt-ruby', '~> 3.0.0' -gem 'jquery-rails' + +if RUBY_VERSION < '1.9.3' + gem 'jquery-rails', '< 4' +else + gem 'jquery-rails' +end if ENV['JOURNEY'] gem 'journey', :path => ENV['JOURNEY'] @@ -17,7 +22,12 @@ else gem 'journey' end -gem 'i18n', '~> 0.6.11' +if RUBY_VERSION < '1.9.3' + gem 'i18n', '~> 0.6.11', '< 0.7' +else + gem 'i18n', '~> 0.6.11' +end + gem 'test-unit', '~> 3.0.0' if RUBY_VERSION < '1.9.3' @@ -26,12 +36,21 @@ end # This needs to be with require false to avoid # it being automatically loaded by sprockets -gem 'uglifier', '>= 1.0.3', :require => false +if RUBY_VERSION < '1.9.3' + gem 'uglifier', '>= 1.0.3', '< 3', :require => false +else + gem 'uglifier', '>= 1.0.3', :require => false +end # execjs >= 2.1.0 doesn't work with Ruby 1.8 gem 'execjs', '< 2.1.0' -gem 'rake', '>= 0.8.7' +if RUBY_VERSION < '1.9.3' + gem 'rake', '>= 0.8.7', '< 11' +else + gem 'rake', '>= 0.8.7' +end + gem 'mocha', '~> 0.14', :require => false group :doc do |