Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

4 files changed, 6 insertions, 3 deletions

diff --git a/scripts/api/cancel_pipeline b/scripts/api/cancel_pipeline.rb
index 0965877a69a..0965877a69a 100755
--- a/scripts/api/cancel_pipeline
+++ b/scripts/api/cancel_pipeline.rb
diff --git a/scripts/api/download_job_artifact b/scripts/api/download_job_artifact.rb
index 8e2207c6fa7..8e2207c6fa7 100755
--- a/scripts/api/download_job_artifact
+++ b/scripts/api/download_job_artifact.rb
diff --git a/scripts/api/get_job_id b/scripts/api/get_job_id.rb
index c7fe859db91..c7fe859db91 100755
--- a/scripts/api/get_job_id
+++ b/scripts/api/get_job_id.rb
diff --git a/scripts/api/play_job b/scripts/api/play_job.rb
index 199f7e65633..408dfdf1ef0 100755
--- a/scripts/api/play_job
+++ b/scripts/api/play_job.rb
@@ -14,7 +14,6 @@ class PlayJob
   }.freeze
 
   def initialize(options)
-    @project = options.delete(:project)
     @options = options
 
     Gitlab.configure do |config|
@@ -24,14 +23,18 @@ class PlayJob
   end
 
   def execute
-    job = JobFinder.new(project, options.slice(:api_token, :pipeline_id, :job_name).merge(scope: 'manual')).execute
+    job = JobFinder.new(options.slice(:project, :api_token, :pipeline_id, :job_name).merge(scope: 'manual')).execute
 
     Gitlab.job_play(project, job.id)
   end
 
   private
 
-  attr_reader :project, :options
+  attr_reader :options
+
+  def project
+    options[:project]
+  end
 end
 
 if $0 == __FILE__