diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-07-13 00:17:32 +0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-07-13 00:23:16 +0200 |
| commit | fd9214a898d7022edd47176d4432d014d37471e9 (patch) | |
| tree | aeeed256533965a3f2563c592b8baa5cc0f6cf24 | |
| parent | c53f968c63747605a2ee6617a37a14d039832a87 (diff) | |
| download | gitlab-ce-fd9214a898d7022edd47176d4432d014d37471e9.tar.gz | |
Codestyle changes
| -rw-r--r-- | config/resque.yml.example | 32 | ||||
| -rw-r--r-- | lib/gitlab/mail_room.rb | 1 |
2 files changed, 16 insertions, 17 deletions
diff --git a/config/resque.yml.example b/config/resque.yml.example index 7b03132ff9e..20a1c07690f 100644 --- a/config/resque.yml.example +++ b/config/resque.yml.example @@ -3,13 +3,13 @@ # development: url: redis://localhost:6379 -# sentinels: -# - -# host: localhost -# port: 26380 # point to sentinel, not to redis port -# - -# host: slave2 -# port: 26381 # point to sentinel, not to redis port + # sentinels: + # - + # host: localhost + # port: 26380 # point to sentinel, not to redis port + # - + # host: slave2 + # port: 26381 # point to sentinel, not to redis port test: url: redis://localhost:6379 production: @@ -18,17 +18,17 @@ production: ## # Redis + Sentinel (for HA) # - # Please read instructions carefully before using it as you may loose data: + # Please read instructions carefully before using it as you may lose data: # http://redis.io/topics/sentinel # # You must specify a list of a few sentinels that will handle client connection # please read here for more information: https://github.com/redis/redis-rb#sentinel-support ## - #url: redis://master:6379 - # sentinels: - # - - # host: slave1 - # port: 26379 # point to sentinel, not to redis port - # - - # host: slave2 - # port: 26379 # point to sentinel, not to redis port + # url: redis://master:6379 + # sentinels: + # - + # host: slave1 + # port: 26379 # point to sentinel, not to redis port + # - + # host: slave2 + # port: 26379 # point to sentinel, not to redis port diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb index b49cf1c633b..1f68e09fa2b 100644 --- a/lib/gitlab/mail_room.rb +++ b/lib/gitlab/mail_room.rb @@ -4,7 +4,6 @@ require_relative 'redis' unless defined?(Gitlab::Redis) module Gitlab module MailRoom - class << self def enabled? config[:enabled] && config[:address] |