diff --git a/Gemfile b/Gemfile index 527521b..5eb0355 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rack-cors', :require => 'rack/cors' gem 'rails', '~> 5.2.1' gem 'pg', '~> 1.1' gem 'puma', '~> 4.0' -gem 'sass-rails', '~> 5.0' +gem 'sass-rails', '~> 6.0' gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 5.0' gem 'turbolinks', '~> 5' diff --git a/Gemfile.lock b/Gemfile.lock index 07cf239..b8a2250 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,9 +154,9 @@ GEM minitest (5.11.3) multi_json (1.13.1) nio4r (2.4.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - nokogiri (1.10.3-x86-mingw32) + nokogiri (1.10.4-x86-mingw32) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) pg (1.1.4) @@ -187,7 +187,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) railties (5.2.3) actionpack (= 5.2.3) @@ -196,9 +196,6 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rake (12.3.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) - ffi (~> 1.0) regexp_parser (1.6.0) request_store (1.4.1) rack (>= 1.4) @@ -206,17 +203,8 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rubyzip (1.2.3) - 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) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) sassc (2.0.1) ffi (~> 1.9) rake @@ -291,7 +279,7 @@ DEPENDENCIES rack-cors rails (~> 5.2.1) rubyzip - sass-rails (~> 5.0) + sass-rails (~> 6.0) selenium-webdriver turbolinks (~> 5) tzinfo-data