kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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:
Sean McGivern 2019-09-03 13:37:48 +00:00
parent 7a07d9b2d3 ebb8197860
commit 6c9b98364c
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/system_check/incoming_email/foreman_configured_check.rb
View File

@ -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

2
lib/system_check/incoming_email_check.rb
View File

@ -14,8 +14,6 @@ module SystemCheck
if Rails.env.production?
checks << SystemCheck::IncomingEmail::InitdConfiguredCheck
checks << SystemCheck::IncomingEmail::MailRoomRunningCheck
else
checks << SystemCheck::IncomingEmail::ForemanConfiguredCheck
end
SystemCheck.run('Reply by email', checks)