Merge branch 'deploy_job_api' into 'master'

API for deploy jobs

https://dev.gitlab.org/gitlab/gitlab-ci/issues/192

See merge request !69

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 8c4b3c1..3d98866 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -17,7 +17,8 @@ module API
     end
 
     class Project < Grape::Entity
-      expose :id, :name, :timeout, :token, :default_ref, :gitlab_url, :always_build, :polling_interval, :public, :ssh_url_to_repo, :gitlab_id
+      expose :id, :name, :timeout, :token, :default_ref, :gitlab_url,
+        :always_build, :polling_interval, :public, :ssh_url_to_repo, :gitlab_id
     end
 
     class RunnerProject < Grape::Entity
@@ -29,7 +30,13 @@ module API
     end
 
     class Job < Grape::Entity
-      expose :id, :project_id, :commands, :active, :name, :build_branches, :build_tags, :tags
+      expose :id, :project_id, :commands, :active, :name, :build_branches,
+        :build_tags, :tags, :job_type, :tag_list
+    end
+
+    class DeployJob < Grape::Entity
+      expose :id, :project_id, :commands, :active, :name,
+        :refs, :tags, :job_type, :refs, :tag_list
     end
   end
 end