Fixed MailRoom specs and make sure it works with new resque.yml format

Some codestyle changes

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb
index 781c89579b6..b49cf1c633b 100644
--- a/lib/gitlab/mail_room.rb
+++ b/lib/gitlab/mail_room.rb
@@ -14,6 +14,10 @@ module Gitlab
         @config ||= fetch_config
       end
 
+      def reload_config!
+        @config = fetch_config
+      end
+
       private
 
       def fetch_config
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index 9c4b01bfe1a..70e333eb29f 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -24,7 +24,7 @@ module Gitlab
 
       # @deprecated Use .params instead to get sentinel support
       def url
-        raw_config_hash[:url]
+        new.url
       end
 
       def with
@@ -45,6 +45,10 @@ module Gitlab
       redis_store_options
     end
 
+    def url
+      raw_config_hash[:url]
+    end
+
     private
 
     def redis_store_options