summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2019-05-21 09:21:54 +0000
committerJames Lopez <james@gitlab.com>2019-05-21 09:21:54 +0000
commit383d61af5c2a5a920213957365f6a2a791f79103 (patch)
tree30f3c6156f17af569890de8a7d523636535bb1f1 /lib
parentea7b10cd57f5c4f1739725eff79c1d340ece7a15 (diff)
parentcef8d1d40847322a8cce3fdeb6f353ebfd298193 (diff)
downloadgitlab-ce-383d61af5c2a5a920213957365f6a2a791f79103.tar.gz
Merge branch 'add-allow_failure-to-job-api' into 'master'
Add allow_failure attribute to Job API Closes #50813 See merge request gitlab-org/gitlab-ce!28406
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 625fada4f08..1a3318fe849 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1266,7 +1266,7 @@ module API
end
class JobBasic < Grape::Entity
- expose :id, :status, :stage, :name, :ref, :tag, :coverage
+ expose :id, :status, :stage, :name, :ref, :tag, :coverage, :allow_failure
expose :created_at, :started_at, :finished_at
expose :duration
expose :user, with: User