diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 12:07:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 12:07:41 +0000 |
| commit | 8cc5f2790908ba9bb8eecba2b78a3c5a88c77b90 (patch) | |
| tree | 2d6211503a5111d43a9edce0c56b94fd1b347e1b /app/models/clusters/applications/elastic_stack.rb | |
| parent | 17b91a3c6ab73fff087e91665e9afb8046cbf045 (diff) | |
| download | gitlab-ce-8cc5f2790908ba9bb8eecba2b78a3c5a88c77b90.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters/applications/elastic_stack.rb')
| -rw-r--r-- | app/models/clusters/applications/elastic_stack.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/clusters/applications/elastic_stack.rb b/app/models/clusters/applications/elastic_stack.rb index 8589f8c00cb..9854ad2ea3e 100644 --- a/app/models/clusters/applications/elastic_stack.rb +++ b/app/models/clusters/applications/elastic_stack.rb @@ -71,6 +71,8 @@ module Clusters # `proxy_url` could raise an exception because gitlab can not communicate with the cluster. # We check for a nil client in downstream use and behaviour is equivalent to an empty state log_exception(error, :failed_to_create_elasticsearch_client) + + nil end end |