diff options
| author | Constance Okoghenun <constanceokoghenun@gmail.com> | 2018-11-05 10:33:05 +0100 |
|---|---|---|
| committer | Constance Okoghenun <constanceokoghenun@gmail.com> | 2018-11-05 10:33:05 +0100 |
| commit | 3bac1a322c82dd9b6e9b23edd66fa45afaa9859f (patch) | |
| tree | d3e7d47a3e0c8047cb2972aefbc12fe1e3080ef8 /app/models/commit_status.rb | |
| parent | fe7b6f57120946a5d5fe4a4d54a245dc76b06dc8 (diff) | |
| parent | 9e2eb85e365e2a33e52e3f1f48cc23ad4201a52b (diff) | |
| download | gitlab-ce-issue_51323.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_51323issue_51323
Diffstat (limited to 'app/models/commit_status.rb')
| -rw-r--r-- | app/models/commit_status.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 344f091c872..95c88e11a6e 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -50,7 +50,8 @@ class CommitStatus < ActiveRecord::Base runner_system_failure: 4, missing_dependency_failure: 5, runner_unsupported: 6, - stale_schedule: 7 + stale_schedule: 7, + job_execution_timeout: 8 } ## @@ -166,12 +167,12 @@ class CommitStatus < ActiveRecord::Base false end - # To be overriden when inherrited from + # To be overridden when inherrited from def retryable? false end - # To be overriden when inherrited from + # To be overridden when inherrited from def cancelable? false end |