diff options
| -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 |