diff options
| author | DJ Mountney <david@twkie.net> | 2018-10-29 14:37:19 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2018-10-29 14:37:19 -0700 |
| commit | 06b6daacb15b92b04e05538b37aadfdb04fc5a4b (patch) | |
| tree | 0500cf47f7d8d2e6bc7ed53cbf9ad957f07fb31a /app/presenters | |
| parent | c847f172d25efc211045c363f4e55402ad250c09 (diff) | |
| parent | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (diff) | |
| download | gitlab-ce-06b6daacb15b92b04e05538b37aadfdb04fc5a4b.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/commit_status_presenter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb index 29eaad759bb..a866e76df5a 100644 --- a/app/presenters/commit_status_presenter.rb +++ b/app/presenters/commit_status_presenter.rb @@ -9,7 +9,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated runner_system_failure: 'There has been a runner system failure, please try again', missing_dependency_failure: 'There has been a missing dependency failure', runner_unsupported: 'Your runner is outdated, please upgrade your runner', - stale_schedule: 'Delayed job could not be executed by some reason, please try again' + stale_schedule: 'Delayed job could not be executed by some reason, please try again', + job_execution_timeout: 'The script exceeded the maximum execution time set for the job' }.freeze private_constant :CALLOUT_FAILURE_MESSAGES |