kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

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

Browse source 
Upgrade to coffee-rails 4.1.0
This commit is contained in:
Guillermo Iguaran 2014-10-12 20:41:59 -05:00
commit 996aab576e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -14,7 +14,7 @@ gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2' gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 4.0.0.beta2' gem 'jquery-rails', '~> 4.0.0.beta2'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.1.0'
gem 'turbolinks', '~> 2.2.3' gem 'turbolinks', '~> 2.2.3'
# require: false so bcrypt is loaded only when has_secure_password is used. # require: false so bcrypt is loaded only when has_secure_password is used.

4
railties/lib/rails/generators/app_base.rb
View file

@ -265,11 +265,11 @@ module Rails
end end
def coffee_gemfile_entry 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? if options.dev? || options.edge?
GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
else else
GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment
end end
end end