Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/api/entities/project_import_status.rb b/lib/api/entities/project_import_status.rb
index 0b884b43e9e..9b7a2bd1f3e 100644
--- a/lib/api/entities/project_import_status.rb
+++ b/lib/api/entities/project_import_status.rb
@@ -4,6 +4,9 @@ module API
   module Entities
     class ProjectImportStatus < ProjectIdentity
       expose :import_status
+      expose :correlation_id do |project, _options|
+        project.import_state.correlation_id
+      end
 
       # TODO: Use `expose_nil` once we upgrade the grape-entity gem
       expose :import_error, if: lambda { |project, _ops| project.import_state&.last_error } do |project|
diff --git a/lib/gitlab/sidekiq_cluster/cli.rb b/lib/gitlab/sidekiq_cluster/cli.rb
index f1befe4aff1..1e5d23a8405 100644
--- a/lib/gitlab/sidekiq_cluster/cli.rb
+++ b/lib/gitlab/sidekiq_cluster/cli.rb
@@ -115,7 +115,7 @@ module Gitlab
       end
 
       def hard_stop_stuck_pids
-        SidekiqCluster.signal_processes(SidekiqCluster.pids_alive(@processes), :KILL)
+        SidekiqCluster.signal_processes(SidekiqCluster.pids_alive(@processes), "-KILL")
       end
 
       def wait_for_termination