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

load oauth_keys.yml.example as default so I don't have to touch my oauth_keys.yml to have the specs pass on my machine

Browse source
This commit is contained in:
Jonne Hass 2011-09-11 23:45:14 +02:00
parent 586746868c
commit 41effa7bd2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/initializers/_before_load_services.rb
View file

@ -11,9 +11,8 @@ oauth_keys_file = "#{Rails.root}/config/oauth_keys.yml"
SERVICES = nil SERVICES = nil
silence_warnings do silence_warnings do
SERVICES = load_config_yaml("#{oauth_keys_file}.example")
if File.exist? oauth_keys_file if File.exist? oauth_keys_file
SERVICES = load_config_yaml(oauth_keys_file) SERVICES.deep_merge(load_config_yaml(oauth_keys_file))
else
SERVICES = load_config_yaml("#{oauth_keys_file}.example")
end end
end end