aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-25 16:39:25 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-25 16:40:35 -0500
commit94bebde8a7a9334d3cd5de3f2252a8a842722528 (patch)
tree02320b8fa16d8799fac9c1df1d4f563d5410eca8
parenta44a5e4bbd0c1429a052444f4ce715d5360c1a0b (diff)
downloadrails-94bebde8a7a9334d3cd5de3f2252a8a842722528.tar.gz
rails-94bebde8a7a9334d3cd5de3f2252a8a842722528.tar.bz2
rails-94bebde8a7a9334d3cd5de3f2252a8a842722528.zip
Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile
-rw-r--r--Gemfile2
-rw-r--r--railties/lib/rails/generators/app_base.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index e83e0b6129..5749c43d02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails', '~> 2.2.0'
gem 'turbolinks'
-gem 'coffee-rails', github: 'rails/coffee-rails'
+gem 'coffee-rails', '~> 4.0.0.beta1'
# Needed for compiling the ActionDispatch::Journey parser
gem 'racc', '>=1.4.6', require: false
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index def1d69227..4e703151ba 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -196,8 +196,8 @@ module Rails
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 4.0.0.beta'
- gem 'coffee-rails', '~> 4.0.0.beta'
+ gem 'sass-rails', '~> 4.0.0.beta1'
+ gem 'coffee-rails', '~> 4.0.0.beta1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
#{javascript_runtime_gemfile_entry}