diff options
| author | Kamil Trzciński (OoO till 16th of April) <ayufan@ayufan.eu> | 2018-04-18 11:24:19 +0300 |
|---|---|---|
| committer | Kamil Trzciński (OoO till 16th of April) <ayufan@ayufan.eu> | 2018-04-18 11:24:19 +0300 |
| commit | 55ce9d244853a2534a80db3be4b9cfecb9625dd6 (patch) | |
| tree | 729bc1f336ce24c50e28ffecb52d7ca057435868 /app/models | |
| parent | 019e881d448f05a253bdd6a5dcd26c42885770c4 (diff) | |
| parent | 067f5f11c2f5c987697a78a42f23db1db1a90856 (diff) | |
Merge branch 'improve-jobs-queuing-time-metric' into 'master'
Improve jobs queuing time metric (fixed version)
Closes #45205
See merge request gitlab-org/gitlab-ce!18283
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/commit_status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 3469d5d795c..b6276c2fb50 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -87,7 +87,7 @@ class CommitStatus < ActiveRecord::Base transition [:created, :pending, :running, :manual] => :canceled end - before_transition created: [:pending, :running] do |commit_status| + before_transition [:created, :skipped, :manual] => :pending do |commit_status| commit_status.queued_at = Time.now end |