summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorJeff Stubler <brunsa2@gmail.com>2015-11-12 09:05:29 -0600
committerJeff Stubler <brunsa2@gmail.com>2015-11-12 09:05:29 -0600
commit64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (patch)
treef114ab02adb4815058fe7b84a1527ac5ed7a597e /lib/api/entities.rb
parente0c64fac68b4b3acc48300956146b85e03b426ce (diff)
parent12b35c6fe85073d809a764d24b51937f63b9d098 (diff)
downloadgitlab-ce-64ca9cf3e4a56a19f09160a91c5433d2ddb632cf.tar.gz
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'lib/api/entities.rb')
-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