Skip to content

Commit

Permalink
Update sass-rails
Browse files Browse the repository at this point in the history
  • Loading branch information
compwron committed Jun 15, 2019
1 parent 6cbea67 commit 8ab1cdc
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gem 'aws-sdk-rails'
gem 'rack-cors'

gem 'haml-rails'
gem 'sass-rails', '~> 4'
gem 'sass-rails'
gem 'uglifier'
gem 'coffee-rails'
gem 'bootstrap-sass'
Expand Down
41 changes: 23 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ GEM
html2haml (>= 1.0.1)
railties (>= 4.0.1)
hashie (3.6.0)
hike (1.2.3)
html2haml (2.2.0)
erubis (~> 2.7.0)
haml (>= 4.0, < 6)
Expand Down Expand Up @@ -268,6 +267,9 @@ GEM
thor (>= 0.18.1, < 2.0)
raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
ref (2.0.0)
regexp_parser (1.5.1)
Expand All @@ -293,12 +295,17 @@ GEM
ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyzip (1.2.3)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.1)
ffi (~> 1.9)
rake
Expand All @@ -308,15 +315,13 @@ GEM
sexp_processor (4.12.0)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stripe (3.31.1)
faraday (~> 0.10)
stripe-ruby-mock (2.5.7)
Expand All @@ -336,7 +341,7 @@ GEM
rack (>= 1, < 3)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
tilt (2.0.9)
timecop (0.9.1)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
Expand Down Expand Up @@ -398,7 +403,7 @@ DEPENDENCIES
redcarpet
rspec-collection_matchers
rspec-rails
sass-rails (~> 4)
sass-rails
selenium-webdriver
shoulda-matchers
state_machine!
Expand Down
4 changes: 4 additions & 0 deletions config/initializers/assets.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
filenames = (Dir['app/assets/javascripts/*'] + Dir['app/assets/stylesheets/*']).map do |filepath|
File.basename(filepath).gsub('.scss', '')
end
Rails.application.config.assets.precompile += filenames

0 comments on commit 8ab1cdc

Please sign in to comment.