Merge branch 'master' into migrate-fabricators-to-factory-bot-factories

# Conflicts:
#	Gemfile
#	lib/tasks/dev.rake
#	spec/models/contact_spec.rb
This commit is contained in:
Artur Beljajev 2017-11-15 15:42:54 +02:00
commit be959a8471
59 changed files with 2505 additions and 480 deletions

View file

@ -173,6 +173,8 @@ namespace :dev do
end
end
Setting.api_ip_whitelist_enabled = false
Setting.address_processing = false
Setting.registrar_ip_whitelist_enabled = false
ActiveRecord::Base.transaction do