mirror of
https://github.com/internetee/registry.git
synced 2025-08-06 01:35:10 +02:00
Merge branch 'master' into remove-spring-gem
# Conflicts: # Gemfile.lock
This commit is contained in:
commit
31b3862fb9
9 changed files with 99 additions and 102 deletions
|
@ -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.
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
# Some handy day formats
|
||||
Date::DATE_FORMATS[:dshort] = "%d.%m.%Y"
|
||||
Time::DATE_FORMATS[:dshort] = "%d.%m.%Y"
|
Loading…
Add table
Add a link
Reference in a new issue