summaryrefslogtreecommitdiff
path: root/lib/ci/api/entities.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-11-17 17:01:28 +0100
committerDouwe Maan <douwe@gitlab.com>2015-11-17 17:01:28 +0100
commit0b540a0fadf172277639910023fcf8b713ad35aa (patch)
tree9efe6d84cebdca7bc31bcc0e6e2e3b7bdf2e3185 /lib/ci/api/entities.rb
parent3d50b99d016af91c06a40f7a8bf4c298e241220a (diff)
parentdf0110ba81a86b3e066c8b703e1c26d6d05a75da (diff)
downloadgitlab-ce-0b540a0fadf172277639910023fcf8b713ad35aa.tar.gz
Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
Diffstat (limited to 'lib/ci/api/entities.rb')
-rw-r--r--lib/ci/api/entities.rb7
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