Merge branch 'master' into registry-791

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-06-21 17:38:38 +03:00
commit f299241b28
33 changed files with 343 additions and 344 deletions

View file

@ -2,7 +2,7 @@ Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
config.cache_classes = true
config.eager_load = true
config.eager_load = false
config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600'
@ -25,4 +25,4 @@ Rails.application.configure do
config.cache_store = :memory_store
end
Que.mode = :sync
Que.mode = :sync

View file

@ -1 +0,0 @@
Spring.watch 'config/application.yml'