summaryrefslogtreecommitdiff
path: root/spec/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-04 18:09:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-04 18:09:49 +0000
commit2ecc6e22e3517a2e0d9a5bd0d4297c74e2f338d4 (patch)
tree39e5264a6ea6467910471ed5e98eb379d66a6982 /spec/config
parentaca89cb7e933eca98b794cbd5457ffabd54b43f7 (diff)
downloadgitlab-ce-2ecc6e22e3517a2e0d9a5bd0d4297c74e2f338d4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/config')
-rw-r--r--spec/config/mail_room_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index 206f2744281..289e18be0d7 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'mail_room.yml' do
cmd = "puts ERB.new(File.read(#{absolute_path(mailroom_config_path).inspect})).result"
output, status = Gitlab::Popen.popen(%W(ruby -rerb -e #{cmd}), absolute_path('config'), vars)
- raise "Error interpreting #{mailroom_config_path}: #{output}" unless status.zero?
+ raise "Error interpreting #{mailroom_config_path}: #{output}" unless status == 0
YAML.load(output)
end