From 41effa7bd2be8b4355e51a620d05b80897bce6d0 Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Sun, 11 Sep 2011 23:45:14 +0200
Subject: [PATCH] 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
---
config/initializers/_before_load_services.rb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/config/initializers/_before_load_services.rb b/config/initializers/_before_load_services.rb
index e893ce9aef..8f29b895ba 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
--
GitLab