Update dependencies. Fixes Sass error

This commit is contained in:
Andreas Haller 2015-04-27 21:12:56 +02:00
parent 2b4281ad87
commit 5a07703166
2 changed files with 77 additions and 57 deletions

View file

@ -2,15 +2,15 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.1.7' gem 'rails'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
gem 'sqlite3' gem 'sqlite3'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0' gem 'uglifier'
# Use CoffeeScript for .js.coffee assets and views # Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes # See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby # gem 'therubyracer', platforms: :ruby
gem 'slim-rails' gem 'slim-rails'

View file

@ -1,34 +1,43 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.7) actionmailer (4.2.1)
actionpack (= 4.1.7) actionpack (= 4.2.1)
actionview (= 4.1.7) actionview (= 4.2.1)
activejob (= 4.2.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.7) rails-dom-testing (~> 1.0, >= 1.0.5)
actionview (= 4.1.7) actionpack (4.2.1)
activesupport (= 4.1.7) actionview (= 4.2.1)
rack (~> 1.5.2) activesupport (= 4.2.1)
rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.7) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.7) rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.7) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.7) rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1)
activesupport (= 4.2.1)
globalid (>= 0.3.0)
activemodel (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.7) activerecord (4.2.1)
activemodel (= 4.1.7) activemodel (= 4.2.1)
activesupport (= 4.1.7) activesupport (= 4.2.1)
arel (~> 5.0.0) arel (~> 6.0)
activesupport (4.1.7) activesupport (4.2.1)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.3.8) addressable (2.3.8)
arel (5.0.1.20140414130214) arel (6.0.0)
builder (3.2.2) builder (3.2.2)
capybara (2.4.4) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -37,7 +46,7 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.1) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1) coffee-script (2.4.1)
@ -56,24 +65,28 @@ GEM
execjs (2.5.2) execjs (2.5.2)
faraday (0.9.1) faraday (0.9.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
foundation-rails (5.5.0.0) foundation-rails (5.5.1.2)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.2.0, < 3.4) sass (>= 3.3.0, < 3.5)
globalid (0.3.5)
activesupport (>= 4.1.0)
hashie (3.4.1) hashie (3.4.1)
hike (1.2.3)
i18n (0.7.0) i18n (0.7.0)
jquery-rails (3.1.2) jquery-rails (4.0.3)
railties (>= 3.0, < 5.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.2) json (1.8.2)
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.4.3) mime-types (2.5)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.5.1) minitest (5.6.0)
multi_json (1.11.0) multi_json (1.11.0)
multipart-post (2.0.0) multipart-post (2.0.0)
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
@ -89,33 +102,43 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
rack (1.5.2) rack (1.6.0)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.7) rails (4.2.1)
actionmailer (= 4.1.7) actionmailer (= 4.2.1)
actionpack (= 4.1.7) actionpack (= 4.2.1)
actionview (= 4.1.7) actionview (= 4.2.1)
activemodel (= 4.1.7) activejob (= 4.2.1)
activerecord (= 4.1.7) activemodel (= 4.2.1)
activesupport (= 4.1.7) activerecord (= 4.2.1)
activesupport (= 4.2.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.7) railties (= 4.2.1)
sprockets-rails (~> 2.0) sprockets-rails
railties (4.1.7) rails-deprecated_sanitizer (1.0.3)
actionpack (= 4.1.7) activesupport (>= 4.2.0.alpha)
activesupport (= 4.1.7) rails-dom-testing (1.0.6)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.4.2) rake (10.4.2)
rdoc (4.2.0) rdoc (4.2.0)
json (~> 1.4) json (~> 1.4)
sass (3.2.19) sass (3.4.13)
sass-rails (4.0.5) sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2) sass (~> 3.1)
sprockets (~> 2.8, < 3.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (~> 2.0) sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
@ -130,11 +153,8 @@ GEM
slim (~> 3.0) slim (~> 3.0)
slop (3.6.0) slop (3.6.0)
spring (1.3.4) spring (1.3.4)
sprockets (2.12.3) sprockets (3.0.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4) sprockets-rails (2.2.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -159,7 +179,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
capybara capybara
coffee-rails (~> 4.0.0) coffee-rails
elasticsearch elasticsearch
foundation-rails foundation-rails
jquery-rails jquery-rails
@ -167,11 +187,11 @@ DEPENDENCIES
omniauth omniauth
omniauth-browserid omniauth-browserid
pry pry
rails (= 4.1.7) rails
sass-rails (~> 4.0.3) sass-rails
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
slim-rails slim-rails
spring spring
sqlite3 sqlite3
turbolinks turbolinks
uglifier (>= 1.3.0) uglifier