Small refactor and a few documentation fixes
This commit is contained in:
parent
45b392b203
commit
ce41b5c73f
4 changed files with 7 additions and 7 deletions
|
@ -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.
|
||||
|
||||
|
|
|
@ -13,8 +13,8 @@ module Gitlab
|
|||
@config ||= fetch_config
|
||||
end
|
||||
|
||||
def reload_config!
|
||||
@config = fetch_config
|
||||
def reset_config!
|
||||
@config = nil
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue