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 /lib/api | |
| 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 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 2f6565a..2f7ca0f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -13,7 +13,7 @@ module API class Build < Grape::Entity expose :id, :commands, :path, :ref, :sha, :project_id, :repo_url, - :before_sha, :timeout, :allow_git_fetch, :project_name + :before_sha, :timeout, :allow_git_fetch, :project_name, :options expose :variables, using: Variable end |