kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Support Rails with sass-rails 6

Browse source
This commit is contained in:
Rafael Mendonça França 2019-08-16 16:13:24 -04:00
parent 5e2d3d1142
commit 1953e0e1ac
No known key found for this signature in database
GPG key ID: FC23B6D0F1EEE948
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Gemfile.lock
View file

@ -191,7 +191,7 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.1.4) concurrent-ruby (1.1.5)
connection_pool (2.2.2) connection_pool (2.2.2)
cookiejar (0.3.3) cookiejar (0.3.3)
crack (0.4.3) crack (0.4.3)
@ -341,12 +341,12 @@ GEM
mysql2 (0.5.2-x86-mingw32) mysql2 (0.5.2-x86-mingw32)
nio4r (2.3.1) nio4r (2.3.1)
nio4r (2.3.1-java) nio4r (2.3.1-java)
nokogiri (1.10.3) nokogiri (1.10.4)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
nokogiri (1.10.3-java) nokogiri (1.10.4-java)
nokogiri (1.10.3-x64-mingw32) nokogiri (1.10.4-x64-mingw32)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
nokogiri (1.10.3-x86-mingw32) nokogiri (1.10.4-x86-mingw32)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
os (1.0.0) os (1.0.0)
parallel (1.17.0) parallel (1.17.0)
@ -381,7 +381,7 @@ GEM
rails-html-sanitizer (1.2.0) rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.2, >= 2.2.2)
rainbow (3.0.0) rainbow (3.0.0)
rake (12.3.2) rake (12.3.3)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.10.0) rb-inotify (0.10.0)
ffi (~> 1.0) ffi (~> 1.0)
@ -427,17 +427,17 @@ GEM
rufus-scheduler (3.6.0) rufus-scheduler (3.6.0)
fugit (~> 1.1, >= 1.1.6) fugit (~> 1.1, >= 1.1.6)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.7.2) sass-rails (6.0.0)
sass-listen (~> 4.0.0) sassc-rails (~> 2.1, >= 2.1.1)
sass-listen (4.0.0) sassc (2.0.1)
rb-fsevent (~> 0.9, >= 0.9.4) ffi (~> 1.9)
rb-inotify (~> 0.9, >= 0.9.7) rake
sass-rails (5.0.7) sassc-rails (2.1.2)
railties (>= 4.0.0, < 6) railties (>= 4.0.0)
sass (~> 3.1) sassc (>= 2.0)
sprockets (>= 2.8, < 4.0) sprockets (> 3.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails
tilt (>= 1.1, < 3) tilt
sdoc (1.0.0) sdoc (1.0.0)
rdoc (>= 5.0) rdoc (>= 5.0)
selenium-webdriver (3.142.3) selenium-webdriver (3.142.3)
@ -525,7 +525,7 @@ GEM
websocket-extensions (0.1.3) websocket-extensions (0.1.3)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
zeitwerk (2.1.8) zeitwerk (2.1.9)
PLATFORMS PLATFORMS
java java

2
railties/lib/rails/generators/app_base.rb
View file

@ -306,7 +306,7 @@ module Rails
def assets_gemfile_entry def assets_gemfile_entry
return [] if options[:skip_sprockets] return [] if options[:skip_sprockets]
GemfileEntry.version("sass-rails", ">= 5", "Use SCSS for stylesheets") GemfileEntry.version("sass-rails", ">= 6", "Use SCSS for stylesheets")
end end
def webpacker_gemfile_entry def webpacker_gemfile_entry