diff options
| author | Andrew White <andrew.white@unboxed.co> | 2017-01-04 11:23:46 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2017-01-04 11:23:46 +0000 |
| commit | 9065da85937c1ae6a8b9188a28ac58b4bb9c479e (patch) | |
| tree | bb9f86e937e62e7a41fdf398d4586ffad6b2b1f0 | |
| parent | 00e076ea8228087efab9cf750b91bcac8c365707 (diff) | |
| download | rails-9065da85937c1ae6a8b9188a28ac58b4bb9c479e.tar.gz rails-9065da85937c1ae6a8b9188a28ac58b4bb9c479e.tar.bz2 rails-9065da85937c1ae6a8b9188a28ac58b4bb9c479e.zip | |
Restrict jquery-rails to less than 4.0
This is because jquery-rails 4.0.0 and later requires railties >= 4.2.0.
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
2 files changed, 2 insertions, 7 deletions
@@ -9,12 +9,7 @@ else end gem 'bcrypt-ruby', '~> 3.0.0' - -if RUBY_VERSION < '1.9.3' - gem 'jquery-rails', '< 4' -else - gem 'jquery-rails' -end +gem 'jquery-rails', '< 4' if ENV['JOURNEY'] gem 'journey', :path => ENV['JOURNEY'] diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 398319ca55..02c50a7717 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -227,7 +227,7 @@ module Rails end def javascript_gemfile_entry - "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript] + "gem '#{options[:javascript]}-rails', '< 4'" unless options[:skip_javascript] end def javascript_runtime_gemfile_entry |