diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-07-06 11:31:52 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-07-06 11:31:52 +0000 |
commit | 574e71ce3eda70add20b27ccd935e07186a5d7b0 (patch) | |
tree | 3df4fa18482559d69db0c63587f17bbce1c8e59e /app/models/commit.rb | |
parent | b27f990de8a1b53974eb9aa0bd6bdde18f93d6db (diff) | |
parent | aaa08b5f48488fc7b6436e04f26a5680d9aebb09 (diff) | |
download | gitlab-ci-574e71ce3eda70add20b27ccd935e07186a5d7b0.tar.gz |
Merge branch 'docker-image' into 'master'
Added support for image and services in YAML
- [x] Prepare changes for GitLab CI
- [x] Prepare documentation (70% done): https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/178
- [x] Prepare GitLab Runner - changes are pushed to bleeding edge
/cc @vsizov
See merge request !181
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 73e485a..dae2658 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -108,7 +108,8 @@ class Commit < ActiveRecord::Base project: project, name: build_attrs[:name], commands: build_attrs[:script], - tag_list: build_attrs[:tags] + tag_list: build_attrs[:tags], + options: build_attrs[:options] }) end end @@ -145,6 +146,7 @@ class Commit < ActiveRecord::Base name: build_attrs[:name], commands: build_attrs[:script], tag_list: build_attrs[:tags], + options: build_attrs[:options], deploy: true }) end |