diff --git a/config/initializers/_before_load_services.rb b/config/initializers/_before_load_services.rb index e893ce9aef9824a42157f438c39947e1d4de1274..8f29b895baceea58cba0fae353842749bef3bc5d 100644 --- a/config/initializers/_before_load_services.rb +++ b/config/initializers/_before_load_services.rb @@ -11,9 +11,8 @@ oauth_keys_file = "#{Rails.root}/config/oauth_keys.yml" SERVICES = nil silence_warnings do + SERVICES = load_config_yaml("#{oauth_keys_file}.example") if File.exist? oauth_keys_file - SERVICES = load_config_yaml(oauth_keys_file) - else - SERVICES = load_config_yaml("#{oauth_keys_file}.example") + SERVICES.deep_merge(load_config_yaml(oauth_keys_file)) end -end \ No newline at end of file +end