Use latest sprockets-rails on internal dev

This commit is contained in:
Arthur Neves 2015-04-26 11:42:13 -04:00
parent 757a2bc3e3
commit ac98359c83
No known key found for this signature in database
GPG Key ID: 04A390FB1E433E17
2 changed files with 15 additions and 7 deletions

View File

@ -18,6 +18,7 @@ gem 'arel', github: 'rails/arel', branch: 'master'
gem 'mail', github: 'mikel/mail'
gem 'sprockets', '~> 3.0.0.rc.1'
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)

View File

@ -35,6 +35,16 @@ GIT
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
GIT
remote: git://github.com/rails/sprockets-rails.git
revision: 85b89c44ad40af3056899808475e6e4bf65c1f5a
branch: master
specs:
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0, < 4.0)
PATH
remote: .
specs:
@ -172,7 +182,7 @@ GEM
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
rails-dom-testing (1.0.6)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
@ -219,19 +229,15 @@ GEM
serverengine
thor
thread
sprockets (3.0.0.rc.1)
sprockets (3.0.2)
rack (~> 1.0)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
stackprof (0.2.7)
sucker_punch (1.3.2)
celluloid (~> 0.16.0)
thor (0.19.1)
thread (0.1.5)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
timers (4.0.1)
hitimes
@ -293,6 +299,7 @@ DEPENDENCIES
sidekiq
sneakers (= 0.1.1.pre)
sprockets (~> 3.0.0.rc.1)
sprockets-rails!
sqlite3 (~> 1.3.6)
stackprof
sucker_punch