Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Hass <mrzyx@mrzyx.de>2011-09-13 00:28:13 +0400
committerJonne Hass <mrzyx@mrzyx.de>2011-09-13 00:28:13 +0400
commit5ae96efdf62e94ccf1d22374d559bb862a7cae99 (patch)
tree399d510fd1ff7097a9906a4bd9dea399d9528290
parent6a6c4cd82b6ff5c59855b2209427d92997c712ce (diff)
fix oauth keys, deep_merge vs deep_merge! my bad
-rw-r--r--config/initializers/_before_load_services.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/_before_load_services.rb b/config/initializers/_before_load_services.rb
index 8f29b895b..48461e91a 100644
--- a/config/initializers/_before_load_services.rb
+++ b/config/initializers/_before_load_services.rb
@@ -13,6 +13,6 @@ SERVICES = nil
silence_warnings do
SERVICES = load_config_yaml("#{oauth_keys_file}.example")
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