Merge branch 'winh-dev-incoming_email-check' into 'master'

Remove outdated mail_room check

See merge request gitlab-org/gitlab-ce!32588

2 files changed, 0 insertions, 27 deletions

diff --git a/lib/system_check/incoming_email/foreman_configured_check.rb b/lib/system_check/incoming_email/foreman_configured_check.rb
deleted file mode 100644
index 944913087da..00000000000
--- a/lib/system_check/incoming_email/foreman_configured_check.rb
+++ /dev/null
@@ -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
diff --git a/lib/system_check/incoming_email_check.rb b/lib/system_check/incoming_email_check.rb
index 155b6547595..e0e1147711c 100644
--- a/lib/system_check/incoming_email_check.rb
+++ b/lib/system_check/incoming_email_check.rb
@@ -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)