diff --git a/Gemfile b/Gemfile index c0970bea0..e2c69cdc5 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'nokogiri' # style gem 'bootstrap-sass', '~> 3.4' -gem 'sass-rails', '5.0.6' # sass style +gem 'sass-rails', '6.0.0' # sass style gem 'coffee-rails', '~> 4.2' gem 'jquery-rails' gem 'selectize-rails', '0.12.1' # include selectize.js for select diff --git a/Gemfile.lock b/Gemfile.lock index 8d171c86c..87cf0503f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -349,9 +349,6 @@ GEM activesupport (>= 5.2.1) i18n polyamorous (= 2.3.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.1) - ffi (~> 1.0) rbtree3 (0.6.0) rdoc (4.3.0) regexp_parser (1.6.0) @@ -381,19 +378,16 @@ GEM ruby2_keywords (0.0.2) rubyzip (2.2.0) safe_yaml (1.0.5) - 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.6) - 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.2.1) ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt savon (2.12.0) akami (~> 1.2) builder (>= 2.1.2) @@ -516,7 +510,7 @@ DEPENDENCIES rails-settings-cached (= 0.7.2) ransack (~> 2.3) rest-client - sass-rails (= 5.0.6) + sass-rails (= 6.0.0) sdoc (= 0.4.1) select2-rails (= 3.5.9.3) selectize-rails (= 0.12.1)