From ce41b5c73f7574ec19c47f24e9450ff1b54ef1b1 Mon Sep 17 00:00:00 2001 From: Gabriel Mazetto Date: Thu, 4 Aug 2016 18:55:24 +0200 Subject: Small refactor and a few documentation fixes --- spec/config/mail_room_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/config') 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 -- cgit v1.2.3