diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-10-12 20:41:59 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-10-12 20:41:59 -0500 |
| commit | 996aab576eefb351025ae1d56371f41a0eb074c5 (patch) | |
| tree | 1ae64b764355a02a630d869faf3f9690c78aba2c | |
| parent | 51278579477eb7ee20fe2aba53b4b13203791b22 (diff) | |
| parent | fa5a1b9345fd52eda76b38d673cd329330b1197e (diff) | |
| download | rails-996aab576eefb351025ae1d56371f41a0eb074c5.tar.gz rails-996aab576eefb351025ae1d56371f41a0eb074c5.tar.bz2 rails-996aab576eefb351025ae1d56371f41a0eb074c5.zip | |
Merge pull request #17241 from josh/coffee-rails-4-1
Upgrade to coffee-rails 4.1.0
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' gem 'jquery-rails', '~> 4.0.0.beta2' -gem 'coffee-rails', '~> 4.0.0' +gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks', '~> 2.2.3' # require: false so bcrypt is loaded only when has_secure_password is used. diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0d95bb48e0..1eca86bd30 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -265,11 +265,11 @@ module Rails end def coffee_gemfile_entry - comment = 'Use CoffeeScript for .js.coffee assets and views' + comment = 'Use CoffeeScript for .coffee assets and views' if options.dev? || options.edge? GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment else - GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment + GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment end end |