Merge branch 'master' into 'master'

Sidekiq::MemoryKiller: Add missing space in log message

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

changelogs/unreleased/14553-missing-space-in-log-msg.yml

+---
+title: "Add missing space in Sidekiq memory killer log message"
+merge_request: 14553
+author: Benjamin Drung
+type: fixed

lib/gitlab/sidekiq_middleware/memory_killer.rb

@@ -25,7 +25,7 @@ module Gitlab
 
           Sidekiq.logger.warn "current RSS #{current_rss} exceeds maximum RSS "\
             "#{MAX_RSS}"
-          Sidekiq.logger.warn "this thread will shut down PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"\
+          Sidekiq.logger.warn "this thread will shut down PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']} "\
             "in #{GRACE_TIME} seconds"
           sleep(GRACE_TIME)