Commit 131e1db5 authored by Sean McGivern's avatar Sean McGivern

Merge branch '3516-fix-nomethoderror-zero-on-nil' into 'master'

Fix an error reporting some failures in the elasticsearch indexer

Closes #3516

See merge request gitlab-org/gitlab-ee!2998
parents 0c42fb8b c78cdd71
---
title: Fix an error reporting some failures in the elasticsearch indexer
merge_request: 2998
author:
type: fixed
...@@ -63,7 +63,7 @@ module Gitlab ...@@ -63,7 +63,7 @@ module Gitlab
output, status = Gitlab::Popen.popen(command, nil, vars) output, status = Gitlab::Popen.popen(command, nil, vars)
raise Error, output unless status.zero? raise Error, output unless status&.zero?
end end
def update_index_status(to_sha) def update_index_status(to_sha)
......
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