zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-04 08:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry into registrar-portal

Browse source 
Conflicts:
	.travis.yml
This commit is contained in:
Martin Lensment 2015-03-23 17:12:15 +02:00
commit 57d239ccd1
9 changed files with 84 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/initializers/initial_settings.rb
View file

@ -1,5 +1,10 @@
# otherwise rake not working 100%
con = ActiveRecord::Base.connection
begin
con = ActiveRecord::Base.connection
rescue ActiveRecord::NoDatabaseError => e
Rails.logger.info "Init settings didn't find database: #{e}"
end
if con.present? && con.table_exists?('settings')
Setting.disclosure_name = true if Setting.disclosure_name.nil?
Setting.disclosure_name = true if Setting.disclosure_name.nil?