From d4f018fc258d8195496e9b15829eb0c81817b240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 19 Aug 2014 19:57:55 -0300 Subject: Require sprockets-rails 3.0.0.beta1 --- Gemfile | 1 - rails.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 973f8efd69..bf190d1086 100644 --- a/Gemfile +++ b/Gemfile @@ -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 -- cgit v1.2.3