aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-04 16:25:46 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-04 16:25:46 -0300
commita338b39f758216038e9249a6ca47b21c91fe0093 (patch)
tree76afdf019dc8d495a9430d6b87ccabb0564ea3a1
parent5f1346b0c7cde53bb849dad89778c80ef1ed6571 (diff)
downloadrails-a338b39f758216038e9249a6ca47b21c91fe0093.tar.gz
rails-a338b39f758216038e9249a6ca47b21c91fe0093.tar.bz2
rails-a338b39f758216038e9249a6ca47b21c91fe0093.zip
Make possible to use sprockets-rails 2.1
-rw-r--r--Gemfile1
-rw-r--r--rails.gemspec2
2 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4a891bf6b5..5bc810fa79 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 3.1.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
diff --git a/rails.gemspec b/rails.gemspec
index d1c199a97a..4800df0df4 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
s.add_dependency 'railties', version
s.add_dependency 'bundler', '>= 1.3.0', '< 2.0'
- s.add_dependency 'sprockets-rails', '~> 2.0.0'
+ s.add_dependency 'sprockets-rails', '~> 2.1'
end