diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-15 19:02:48 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-15 19:02:48 +0800 |
| commit | 0ea81ae50a702c7341b1bd6fd15002ee78ac4964 (patch) | |
| tree | 4b8b9589df10a326b734eaf657185ee12e557999 /app/models/commit_status.rb | |
| parent | 5e7d99d3dc3cc7c5cf644f15610ed9813b45cb41 (diff) | |
| parent | 4d4ef89cdcb9beca66a13ab2b64e9eb45f8d8256 (diff) | |
| download | gitlab-ce-0ea81ae50a702c7341b1bd6fd15002ee78ac4964.tar.gz | |
Merge remote-tracking branch 'upstream/pipeline-hooks-without-slack' into wall-clock-time-for-showing-pipeline
* upstream/pipeline-hooks-without-slack:
Make explicit call for all event types for ProjectHook factory
Capitalise URL on web_hooks/form
Remove changes not related to this MR
Added documentation for pipeline hooks
Rename queue to enqueue in tests
Instrument Project.visible_to_user
Fix build play failure
Update ruby 2.3.1
Improve transition between states for event `enqueue`
Use event `enqueue` instead of `queue`
Fix test failures
Fix bug where destroying a namespace would not always destroy projects
Remove unused SpamReport model; this was renamed to SpamLog
Corrected links/usernames in performance guide
Add gravatars to build history
Add deployment ID and gravatar to environments page
Format environment history page
Add avatar to commit message; environment style updates to match pipelines page
Style deploy button
Diffstat (limited to 'app/models/commit_status.rb')
| -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 9e1e9b76ce4..7542399169f 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -27,7 +27,7 @@ class CommitStatus < ActiveRecord::Base scope :ignored, -> { where(allow_failure: true, status: [:failed, :canceled]) } state_machine :status do - event :queue do + event :enqueue do transition [:created, :skipped] => :pending end |