summaryrefslogtreecommitdiff
path: root/lib/api/helpers/runner.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-30 12:31:41 +0100
committerPhil Hughes <me@iamphill.com>2017-06-30 12:37:35 +0100
commit531a4d124b0a17280b4118d7fa7c66f11042917b (patch)
treea2ee668d403ed538d6046f942f31bce2c1224563 /lib/api/helpers/runner.rb
parentf5681fb55a762c9b9bb35c80bf87d727d8d8fd06 (diff)
parent81dba76b9d7d120cd22e3619a4058bd4885be9bc (diff)
downloadgitlab-ce-experimental-breadcrumbs.tar.gz
Merge branch 'master' into experimental-breadcrumbsexperimental-breadcrumbs
Diffstat (limited to 'lib/api/helpers/runner.rb')
-rw-r--r--lib/api/helpers/runner.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index 1369b021ea4..f8645e364ce 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -46,7 +46,8 @@ module API
yield if block_given?
- forbidden!('Project has been deleted!') unless job.project
+ project = job.project
+ forbidden!('Project has been deleted!') if project.nil? || project.pending_delete?
forbidden!('Job has been erased!') if job.erased?
end