summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-11-10 21:28:12 +0000
committerStan Hu <stanhu@gmail.com>2015-11-10 21:28:12 +0000
commit83ec84946ca8b0b71ae201de65991635c50dd518 (patch)
treec0ef2d419c21b37f28fec8fa0d07cb687bddd3f5 /lib
parentca25289b78e1b49148438831ad6bf165fa0ce56e (diff)
parent91cbf9db0c5c95381e7d422fd684e623d58fadab (diff)
downloadgitlab-ce-83ec84946ca8b0b71ae201de65991635c50dd518.tar.gz
Merge branch 'add-allow-failure-status' into 'master'
Add allow_failure field to commit status API Closes #3196 See merge request !1685
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 883a5e14b17..20cadae2291 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -231,7 +231,7 @@ module API
class CommitStatus < Grape::Entity
expose :id, :sha, :ref, :status, :name, :target_url, :description,
- :created_at, :started_at, :finished_at
+ :created_at, :started_at, :finished_at, :allow_failure
expose :author, using: Entities::UserBasic
end