Commit ad5a982d authored by Marin Jankovski's avatar Marin Jankovski Committed by Jacob Vosmaer

Update sass-rails with newer version of rails.

parent 5014a5b7
...@@ -152,7 +152,7 @@ gem "rack-attack" ...@@ -152,7 +152,7 @@ gem "rack-attack"
# Ace editor # Ace editor
gem 'ace-rails-ap' gem 'ace-rails-ap'
gem "sass-rails" gem "sass-rails", '~> 4.0.2'
gem "coffee-rails" gem "coffee-rails"
gem "uglifier" gem "uglifier"
gem "therubyracer" gem "therubyracer"
......
...@@ -427,11 +427,12 @@ GEM ...@@ -427,11 +427,12 @@ GEM
safe_yaml (0.9.7) safe_yaml (0.9.7)
sanitize (2.1.0) sanitize (2.1.0)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
sass (3.2.12) sass (3.2.19)
sass-rails (4.0.1) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10) sass (~> 3.2.0)
sprockets-rails (~> 2.0.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sdoc (0.3.20) sdoc (0.3.20)
json (>= 1.1.3) json (>= 1.1.3)
rdoc (~> 3.10) rdoc (~> 3.10)
...@@ -478,7 +479,7 @@ GEM ...@@ -478,7 +479,7 @@ GEM
spring (>= 0.9.1) spring (>= 0.9.1)
spring-commands-spinach (1.0.0) spring-commands-spinach (1.0.0)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (2.12.1) sprockets (2.11.0)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
...@@ -636,7 +637,7 @@ DEPENDENCIES ...@@ -636,7 +637,7 @@ DEPENDENCIES
redis-rails redis-rails
rspec-rails rspec-rails
sanitize (~> 2.0) sanitize (~> 2.0)
sass-rails sass-rails (~> 4.0.2)
sdoc sdoc
seed-fu seed-fu
select2-rails select2-rails
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment