diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
| commit | 4c6898bdcf0bff6a0a3b288215271be4e916b27c (patch) | |
| tree | 13db382a777a55c8220fcbdd85ebf5bf4cedeb03 /lib/api/runner.rb | |
| parent | ae9b771797cceee76c18376910519e9e71628acc (diff) | |
| parent | 063e285e6a8c26a95809873fb32fefc54fe9bdb6 (diff) | |
| download | gitlab-ce-36860-migrate-issues-author.tar.gz | |
Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/runner.rb')
| -rw-r--r-- | lib/api/runner.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 11999354594..a3987c560dd 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -114,6 +114,8 @@ module API requires :id, type: Integer, desc: %q(Job's ID) optional :trace, type: String, desc: %q(Job's full trace) optional :state, type: String, desc: %q(Job's status: success, failed) + optional :failure_reason, type: String, values: CommitStatus.failure_reasons.keys, + desc: %q(Job's failure_reason) end put '/:id' do job = authenticate_job! @@ -127,7 +129,7 @@ module API when 'success' job.success when 'failed' - job.drop + job.drop(params[:failure_reason] || :unknown_failure) end end |