From 49b0f46f0512b8cbdeea1f5962e356fc32bad443 Mon Sep 17 00:00:00 2001
From: Carol Nichols <carol.nichols@gmail.com>
Date: Tue, 4 Sep 2012 14:17:00 -0400
Subject: [PATCH] Make ENV variables take precedence over config.yml values

---
 config/initializers/config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index d0dd5510..b939eaa6 100644
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -11,7 +11,7 @@
   config.each do |key, value|
     if key == "PONY_VIA_OPTIONS"
       Pony.options = { :via_options => value }
-    else
+    elsif ENV[key].blank?
       ENV[key] = value
     end
   end