Permalink
Browse files

Merge pull request #17241 from josh/coffee-rails-4-1

Upgrade to coffee-rails 4.1.0
  • Loading branch information...
guilleiguaran committed Oct 13, 2014
2 parents 5127857 + fa5a1b9 commit 996aab576eefb351025ae1d56371f41a0eb074c5
Showing with 3 additions and 3 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 railties/lib/rails/generators/app_base.rb
View
@@ -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.
@@ -265,11 +265,11 @@ def sdoc_gemfile_entry
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

0 comments on commit 996aab5

Please sign in to comment.