Merge branch 'winh-dev-incoming_email-check' into 'master'
Remove outdated mail_room check See merge request gitlab-org/gitlab-ce!32588
This commit is contained in:
commit
6c9b98364c
|
@ -1,25 +0,0 @@
|
||||||
# frozen_string_literal: true
|
|
||||||
|
|
||||||
module SystemCheck
|
|
||||||
module IncomingEmail
|
|
||||||
class ForemanConfiguredCheck < SystemCheck::BaseCheck
|
|
||||||
set_name 'Foreman configured correctly?'
|
|
||||||
|
|
||||||
def check?
|
|
||||||
path = Rails.root.join('Procfile')
|
|
||||||
|
|
||||||
File.exist?(path) && File.read(path) =~ /^mail_room:/
|
|
||||||
end
|
|
||||||
|
|
||||||
def show_error
|
|
||||||
try_fixing_it(
|
|
||||||
'Enable mail_room in your Procfile.'
|
|
||||||
)
|
|
||||||
for_more_information(
|
|
||||||
'doc/administration/reply_by_email.md'
|
|
||||||
)
|
|
||||||
fix_and_rerun
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -14,8 +14,6 @@ module SystemCheck
|
||||||
if Rails.env.production?
|
if Rails.env.production?
|
||||||
checks << SystemCheck::IncomingEmail::InitdConfiguredCheck
|
checks << SystemCheck::IncomingEmail::InitdConfiguredCheck
|
||||||
checks << SystemCheck::IncomingEmail::MailRoomRunningCheck
|
checks << SystemCheck::IncomingEmail::MailRoomRunningCheck
|
||||||
else
|
|
||||||
checks << SystemCheck::IncomingEmail::ForemanConfiguredCheck
|
|
||||||
end
|
end
|
||||||
|
|
||||||
SystemCheck.run('Reply by email', checks)
|
SystemCheck.run('Reply by email', checks)
|
||||||
|
|
Loading…
Reference in New Issue