Merge pull request #2458 from TracksApp/replace_sass_with_sassc

Replace sass-rails with sassc-rails.
This commit is contained in:
Jyri-Petteri Paloposki 2020-08-19 13:31:16 +03:00 committed by GitHub
commit f06d391648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 14 deletions

View file

@ -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'

View file

@ -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

View file

@ -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