Merge branch 'master' into remove-spring-gem

# Conflicts:
#	Gemfile.lock
This commit is contained in:
Artur Beljajev 2018-06-18 16:29:28 +03:00
commit 31b3862fb9
9 changed files with 99 additions and 102 deletions

View file

@ -23,7 +23,7 @@ Rails.application.configure do
config.serve_static_files = false
# Compress JavaScripts and CSS.
# config.assets.js_compressor = :uglifier
config.assets.js_compressor = Uglifier.new(harmony: true)
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.