BigW Consortium Gitlab

Commit ce41b5c7 by Gabriel Mazetto

Small refactor and a few documentation fixes

parent 45b392b2
...@@ -59,9 +59,9 @@ Redis. ...@@ -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.
......
...@@ -13,8 +13,8 @@ module Gitlab ...@@ -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
......
...@@ -37,7 +37,7 @@ module Gitlab ...@@ -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
......
...@@ -7,7 +7,7 @@ describe 'mail_room.yml' do ...@@ -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
...@@ -22,7 +22,7 @@ describe 'mail_room.yml' do ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment