diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-19 19:57:55 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-19 19:57:55 -0300 |
commit | d4f018fc258d8195496e9b15829eb0c81817b240 (patch) | |
tree | 0785b2fac7e7c543bfb39c4dc1c1047766cfa804 | |
parent | 43073b393d234acd094ac7c220163f4e419d11f5 (diff) | |
download | rails-d4f018fc258d8195496e9b15829eb0c81817b240.tar.gz rails-d4f018fc258d8195496e9b15829eb0c81817b240.tar.bz2 rails-d4f018fc258d8195496e9b15829eb0c81817b240.zip |
Require sprockets-rails 3.0.0.beta1
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | rails.gemspec | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -14,7 +14,6 @@ gem 'rails-html-sanitizer' # TODO: remove this before the 4.2.0.beta1 release gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' -gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master' # 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 b1a7d16722..a304b16f57 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -28,5 +28,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.1' + s.add_dependency 'sprockets-rails', '~> 3.0.0.beta1' end |