aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorAndrei Istratii <andrei.istratii@gmail.com>2015-08-05 16:14:09 +0300
committerAndrei Istratii <andrei.istratii@gmail.com>2015-08-19 21:45:46 +0300
commitd0e0fbafb205f96444d889c8654f18a9ee0bb328 (patch)
tree00601be017b3d737c5ab142dc3710144651e5ca5 /Gemfile
parentf454ad37ed46e14eb535eb3305d2c3183a5d52f7 (diff)
downloadrails-d0e0fbafb205f96444d889c8654f18a9ee0bb328.tar.gz
rails-d0e0fbafb205f96444d889c8654f18a9ee0bb328.tar.bz2
rails-d0e0fbafb205f96444d889c8654f18a9ee0bb328.zip
Migrate to Sprockets 4.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 95718d67ae..8617060fda 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,8 +20,9 @@ gem 'turbolinks'
gem 'arel', github: 'rails/arel', branch: 'master'
gem 'mail', github: 'mikel/mail'
-gem 'sprockets', '~> 3.0.0.rc.1'
+gem 'sprockets', github: 'rails/sprockets', branch: 'master'
gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
+gem 'sass-rails', github: 'rails/sass-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)
@@ -31,6 +32,7 @@ gem 'bcrypt', '~> 3.1.10', require: false
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', '>= 1.3.0', require: false
+gem 'sass', '>= 3.3', require: false
group :doc do
gem 'sdoc', '~> 0.4.0'