zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 19:48:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/registry-235' into registry-186

Browse source 
# Conflicts:
#	spec/models/domain_spec.rb
This commit is contained in:
Artur Beljajev 2016-11-08 12:39:00 +02:00
commit 3d1dd1759d
5 changed files with 86 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/environments/test.rb
View file

@ -36,8 +36,6 @@ Rails.application.configure do
# For rails-settings-cached conflict
config.cache_store = :file_store, 'tmp/cache_test'
config.time_zone = 'UTC'
config.action_view.raise_on_missing_translations = true
# The available log levels are: :debug, :info, :warn, :error, :fatal, and :unknown,