Skip to content

Commit

Permalink
update compass-rails, current is not working
Browse files Browse the repository at this point in the history
  • Loading branch information
dmacvicar committed Oct 20, 2017
1 parent 6e5624c commit b6daa08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ gem 'nokogiri'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0'
# With compass
gem 'compass-rails', '< 2.0'
gem 'compass', '< 1.0'
gem 'compass-rails', '~> 2.0.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .js.coffee assets and views
Expand Down
8 changes: 3 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (1.1.7)
compass-rails (2.0.0)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
Expand Down Expand Up @@ -161,7 +160,7 @@ GEM
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sprockets (2.11.0)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand Down Expand Up @@ -197,8 +196,7 @@ PLATFORMS

DEPENDENCIES
capybara
compass (< 1.0)
compass-rails (< 2.0)
compass-rails
dalli
fast_gettext (>= 0.7.0)
gettext (>= 1.9.3)
Expand Down

0 comments on commit b6daa08

Please sign in to comment.