Merge branch 'dm-mail-room-check-without-omnibus' into 'master'

Don't check if MailRoom is running on Omnibus

Closes #19607

See merge request !12056

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 63c5e9b9c83..858f1cd7b34 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -336,12 +336,9 @@ namespace :gitlab do
     ########################
 
     def check_initd_configured_correctly
-      print "Init.d configured correctly? ... "
+      return if omnibus_gitlab?
 
-      if omnibus_gitlab?
-        puts 'skipped (omnibus-gitlab has no init script)'.color(:magenta)
-        return
-      end
+      print "Init.d configured correctly? ... "
 
       path = "/etc/default/gitlab"
 
@@ -379,6 +376,8 @@ namespace :gitlab do
     end
 
     def check_mail_room_running
+      return if omnibus_gitlab?
+
       print "MailRoom running? ... "
 
       path = "/etc/default/gitlab"