diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-08-04 18:55:24 +0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-08-04 19:02:39 +0200 |
| commit | ce41b5c73f7574ec19c47f24e9450ff1b54ef1b1 (patch) | |
| tree | db17ab592b3da0e969e2fd4a27bd3d9708cce18e /spec/config | |
| parent | 45b392b2033e3704ca641547e001fcc6df599a88 (diff) | |
| download | gitlab-ce-ce41b5c73f7574ec19c47f24e9450ff1b54ef1b1.tar.gz | |
Small refactor and a few documentation fixes
Diffstat (limited to 'spec/config')
| -rw-r--r-- | spec/config/mail_room_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |