diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-12 10:30:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-12 10:30:31 +0000 |
| commit | 6108332107650f29fea8e39f0a0d2ef0c22a8e6b (patch) | |
| tree | 5abf65646210bd541a94f4dfa2691a6bbeb30550 /config | |
| parent | 93301dd2a91e5ecf163aca1186bc279d4faba182 (diff) | |
| parent | d2f003a344e6f29a0ad5115c7d8dec5727b87895 (diff) | |
| download | gitlab-ce-6108332107650f29fea8e39f0a0d2ef0c22a8e6b.tar.gz | |
Merge branch 'update-health-check-gem' into 'master'
Update the health_check gem to the latest release
## What does this MR do?
Update the health_check gem to the latest release, which allows us to drop some of our code for overwriting the email check
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
- [ ] ~~Added for this feature/bug~~
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5186
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/health_check.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb index 6796407d4e6..4c91a61fb4a 100644 --- a/config/initializers/health_check.rb +++ b/config/initializers/health_check.rb @@ -1,16 +1,3 @@ -# Email forcibly included in the standard checks, but the email health check -# doesn't support the full range of SMTP options, which can result in failures -# for valid SMTP configurations. -# Overwrite the HealthCheck's detection of whether email is configured -# in order to avoid the email check during standard checks -module HealthCheck - class Utils - def self.mailer_configured? - false - end - end -end - HealthCheck.setup do |config| config.standard_checks = ['database', 'migrations', 'cache'] config.full_checks = ['database', 'migrations', 'cache'] |