diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-08-05 10:09:07 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-08-05 10:09:07 +0000 |
| commit | caf4c0dd87ff8c803ed3ed49cda85b29d144668f (patch) | |
| tree | 33a9c844bbeeef902a11d38a31cba3154f45c29a /app/models | |
| parent | 764124c38096ff29a00a0fefbc1a279a32f1bca7 (diff) | |
| parent | 427b5df260cffdfcae5caa4662c7fc38631b48a3 (diff) | |
| download | gitlab-ce-caf4c0dd87ff8c803ed3ed49cda85b29d144668f.tar.gz | |
Merge branch 'ci-skipped-status' into 'master'
Added support for CI skipped status
This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216
See merge request !1073
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/ci_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb index 77d48d4af5e..803402c83ee 100644 --- a/app/models/project_services/ci_service.rb +++ b/app/models/project_services/ci_service.rb @@ -41,7 +41,7 @@ class CiService < Service # Return string with build status or :error symbol # - # Allowed states: 'success', 'failed', 'running', 'pending' + # Allowed states: 'success', 'failed', 'running', 'pending', 'skipped' # # # Ex. |