nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix oauth keys, deep_merge vs deep_merge! my bad

Browse source
This commit is contained in:
Jonne Hass 2011-09-12 22:28:13 +02:00
parent 6a6c4cd82b
commit 5ae96efdf6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/_before_load_services.rb
View file

@ -13,6 +13,6 @@ SERVICES = nil
silence_warnings do silence_warnings do
SERVICES = load_config_yaml("#{oauth_keys_file}.example") SERVICES = load_config_yaml("#{oauth_keys_file}.example")
if File.exist? oauth_keys_file if File.exist? oauth_keys_file
SERVICES.deep_merge(load_config_yaml(oauth_keys_file)) SERVICES.deep_merge!(load_config_yaml(oauth_keys_file))
end end
end end