diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /lib/system_check | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'lib/system_check')
| -rw-r--r-- | lib/system_check/incoming_email_check.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/system_check/incoming_email_check.rb b/lib/system_check/incoming_email_check.rb index e0e1147711c..84033ada710 100644 --- a/lib/system_check/incoming_email_check.rb +++ b/lib/system_check/incoming_email_check.rb @@ -7,9 +7,11 @@ module SystemCheck def multi_check if Gitlab.config.incoming_email.enabled - checks = [ - SystemCheck::IncomingEmail::ImapAuthenticationCheck - ] + checks = [] + + if Gitlab.config.incoming_email.inbox_method == 'imap' + checks << SystemCheck::IncomingEmail::ImapAuthenticationCheck + end if Rails.env.production? checks << SystemCheck::IncomingEmail::InitdConfiguredCheck |