diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:17:41 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:17:41 +0100 |
| commit | 2f048df4a4a83ff009d2ef2d14ee04e5a2798618 (patch) | |
| tree | adf760e3294b8c38348270feddd7aff772a7c26d /app/models/commit_status.rb | |
| parent | 63b234706d46f75c0c0f93bdfdc576e328981eb5 (diff) | |
| download | gitlab-ce-2f048df4a4a83ff009d2ef2d14ee04e5a2798618.tar.gz | |
API support, incorporated feedback
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 b1049fab788..acc86b1a8cd 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -75,7 +75,7 @@ class CommitStatus < ActiveRecord::Base build.update_attributes finished_at: Time.now end - after_transition running: :success do |build, transition| + after_transition [:pending, :running] => :success do |build, transition| MergeRequests::MergeWhenBuildSucceedsService.new(build.commit.gl_project, nil).trigger(build) end |