diff options
author | Jeff Stubler <brunsa2@gmail.com> | 2015-11-12 09:05:29 -0600 |
---|---|---|
committer | Jeff Stubler <brunsa2@gmail.com> | 2015-11-12 09:05:29 -0600 |
commit | 64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (patch) | |
tree | f114ab02adb4815058fe7b84a1527ac5ed7a597e /lib/ci/api/entities.rb | |
parent | e0c64fac68b4b3acc48300956146b85e03b426ce (diff) | |
parent | 12b35c6fe85073d809a764d24b51937f63b9d098 (diff) | |
download | gitlab-ce-64ca9cf3e4a56a19f09160a91c5433d2ddb632cf.tar.gz |
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'lib/ci/api/entities.rb')
-rw-r--r-- | lib/ci/api/entities.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb index b80c0b8b273..750f421872d 100644 --- a/lib/ci/api/entities.rb +++ b/lib/ci/api/entities.rb @@ -11,10 +11,16 @@ module Ci expose :builds end + class ArtifactFile < Grape::Entity + expose :filename, :size + end + class Build < Grape::Entity expose :id, :commands, :ref, :sha, :status, :project_id, :repo_url, :before_sha, :allow_git_fetch, :project_name + expose :name, :token, :stage + expose :options do |model| model.options end @@ -24,6 +30,7 @@ module Ci end expose :variables + expose :artifacts_file, using: ArtifactFile end class Runner < Grape::Entity |