diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-14 22:33:56 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 10:07:12 +0200 |
| commit | 2cc9a785dfdada5e2976b8341d3c9e6eae8fa66f (patch) | |
| tree | bd291b0cabd3e6784f07f8f75f6981f4b6908bd4 | |
| parent | 08272ec1513cbd565e5db5995a681c25e1f4544f (diff) | |
| download | gitlab-ce-2cc9a785dfdada5e2976b8341d3c9e6eae8fa66f.tar.gz | |
Properly create deployment using all possible options
| -rw-r--r-- | app/models/ci/build.rb | 15 | ||||
| -rw-r--r-- | lib/ci/api/entities.rb | 9 |
2 files changed, 17 insertions, 7 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index abdf8c76447..47dedef38d0 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -79,13 +79,14 @@ module Ci after_transition any => [:success] do |build| if build.environment.present? - service = CreateDeploymentService.new(build.project, build.user, - environment: build.environment, - sha: build.sha, - ref: build.ref, - tag: build.tag, - options: build.options[:environment], - variables: variables) + service = CreateDeploymentService.new( + build.project, build.user, + environment: build.environment, + sha: build.sha, + ref: build.ref, + tag: build.tag, + options: build.options[:environment], + variables: variables) service.execute(build) end end diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb index 3f5bdaba3f5..66c05773b68 100644 --- a/lib/ci/api/entities.rb +++ b/lib/ci/api/entities.rb @@ -15,6 +15,15 @@ module Ci expose :filename, :size end + class BuildOptions < Grape::Entity + expose :image + expose :services + expose :artifacts + expose :cache + expose :dependencies + expose :after_script + end + class Build < Grape::Entity expose :id, :ref, :tag, :sha, :status expose :name, :token, :stage |