From 6383c3d9981dff68b91118a91fca2d8c707ab695 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 19 Aug 2020 13:14:07 +0300 Subject: [PATCH] Replace sass-rails with sassc-rails. --- Gemfile | 2 +- Gemfile.lock | 19 +++++++------------ app/controllers/application_controller.rb | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index f9f14189..372556d7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rails', '~> 5.2.4' -gem 'sass-rails', '~> 5.0' +gem 'sassc-rails', '~> 2.0.0' gem 'coffee-rails', '~> 5.0.0' #gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index da5585ed..a5268019 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,20 +221,15 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 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.0) ffi (~> 1.9.6) rake + sassc-rails (2.0.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -325,7 +320,7 @@ DEPENDENCIES rspec-expectations rubocop (~> 0.89) sanitize (~> 5.2) - sass-rails (~> 5.0) + sassc-rails (~> 2.0.0) selenium-webdriver (~> 3.142) simplecov solargraph diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 184b7fb5..9a010552 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base append_before_action :set_group_view_by prepend_before_action :login_required prepend_before_action :enable_mobile_content_negotiation - + def set_locale locale = params[:locale] # specifying a locale in the request takes precedence locale = locale || prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over