Skip to content
Snippets Groups Projects
Commit ce41b5c7 authored by Gabriel Mazetto's avatar Gabriel Mazetto :spy_tone1:
Browse files

Small refactor and a few documentation fixes

parent 45b392b2
No related branches found
No related tags found
No related merge requests found
Loading
@@ -59,9 +59,9 @@ Redis.
Loading
@@ -59,9 +59,9 @@ Redis.
   
## Experimental Redis Sentinel support ## 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 will monitor a group of Redis servers to provide you with a standard failover
support. support.
   
Loading
Loading
Loading
@@ -13,8 +13,8 @@ module Gitlab
Loading
@@ -13,8 +13,8 @@ module Gitlab
@config ||= fetch_config @config ||= fetch_config
end end
   
def reload_config! def reset_config!
@config = fetch_config @config = nil
end end
   
private private
Loading
Loading
Loading
@@ -37,7 +37,7 @@ module Gitlab
Loading
@@ -37,7 +37,7 @@ module Gitlab
end end
end end
   
def initialize(rails_env=nil) def initialize(rails_env = nil)
@rails_env = rails_env || ::Rails.env @rails_env = rails_env || ::Rails.env
end end
   
Loading
Loading
Loading
@@ -7,7 +7,7 @@ describe 'mail_room.yml' do
Loading
@@ -7,7 +7,7 @@ describe 'mail_room.yml' do
context 'when incoming email is disabled' do context 'when incoming email is disabled' do
before do before do
ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/mail_room_disabled.yml').to_s 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 end
   
after do after do
Loading
@@ -22,7 +22,7 @@ describe 'mail_room.yml' do
Loading
@@ -22,7 +22,7 @@ describe 'mail_room.yml' do
context 'when incoming email is enabled' do context 'when incoming email is enabled' do
before do before do
ENV['MAIL_ROOM_GITLAB_CONFIG_FILE'] = Rails.root.join('spec/fixtures/mail_room_enabled.yml').to_s 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 end
   
after do after do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment