diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-26 08:01:29 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-10-26 08:01:29 +0000 |
| commit | 2a8c3f6d5c889e850ad18c796e5fb40f46fda4ca (patch) | |
| tree | 5f394df7397dbebc146514340955165fc8450a75 /lib | |
| parent | 2bbfca8240c605e3b1c4aed18cadda4f6403e138 (diff) | |
| parent | 0c9ad4826a79fa6d1cbbf8c4b1e12af9e4443515 (diff) | |
| download | gitlab-ce-2a8c3f6d5c889e850ad18c796e5fb40f46fda4ca.tar.gz | |
Merge branch 'avoid-lock-when-introduce-new-failure-reason' into 'master'
Support backward compatibility when introduce new failure reason
See merge request gitlab-org/gitlab-ce!22566
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/runner.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index d8768a54986..2f15f3a7d76 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -142,8 +142,7 @@ 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) + optional :failure_reason, type: String, desc: %q(Job's failure_reason) end put '/:id' do job = authenticate_job! |