diff options
| -rw-r--r-- | doc/administration/high_availability/redis.md | 4 | ||||
| -rw-r--r-- | lib/gitlab/mail_room.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/redis.rb | 2 | ||||
| -rw-r--r-- | spec/config/mail_room_spec.rb | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index 65ab8e387cd..bc424330656 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -59,9 +59,9 @@ Redis. ## Experimental Redis Sentinel support -> [Introduced][ce-1877] in GitLab 8.10. +> [Introduced][ce-1877] in GitLab 8.11. -Since GitLab 8.10, you can configure a list of Redis Sentinel servers that +Since GitLab 8.11, you can configure a list of Redis Sentinel servers that will monitor a group of Redis servers to provide you with a standard failover support. diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb index 1f68e09fa2b..12999a90a29 100644 --- a/lib/gitlab/mail_room.rb +++ b/lib/gitlab/mail_room.rb @@ -13,8 +13,8 @@ module Gitlab @config ||= fetch_config end - def reload_config! - @config = fetch_config + def reset_config! + @config = nil end private diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb index 17ac15a01dd..72fa80e61e2 100644 --- a/lib/gitlab/redis.rb +++ b/lib/gitlab/redis.rb @@ -37,7 +37,7 @@ module Gitlab end end - def initialize(rails_env=nil) + def initialize(rails_env = nil) @rails_env = rails_env || ::Rails.env end diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index 2c988f1c883..c5d3cd70acc 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -7,7 +7,7 @@ describe 'mail_room.yml' do context 'when incoming email is disabled' do before do ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/mail_room_disabled.yml').to_s - Gitlab::MailRoom.reload_config! + Gitlab::MailRoom.reset_config! end after do @@ -22,7 +22,7 @@ describe 'mail_room.yml' do context 'when incoming email is enabled' do before do ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/mail_room_enabled.yml').to_s - Gitlab::MailRoom.reload_config! + Gitlab::MailRoom.reset_config! end after do |