diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-12 17:08:36 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-12 17:08:36 +0200 |
| commit | 47f007d63b26fb1df8f8bf813e645141c0f30fe2 (patch) | |
| tree | 2302167086312e7ccf1d818134bc40e4b6da161b /app/models/ci/build.rb | |
| parent | a391652fe60930e2139ecfacb175da6aa0f3b1e9 (diff) | |
| parent | 283b2c0b15bbd39136f601f595157033850dd5a8 (diff) | |
| download | gitlab-ce-47f007d63b26fb1df8f8bf813e645141c0f30fe2.tar.gz | |
Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack
Diffstat (limited to 'app/models/ci/build.rb')
| -rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index ca2fd4f7409..4c84f4c21c5 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -59,7 +59,7 @@ module Ci when: build.when, user: user, environment: build.environment, - status_event: 'queue' + status_event: 'enqueue' ) MergeRequests::AddTodoWhenBuildFailsService.new(build.project, nil).close(new_build) new_build @@ -102,7 +102,7 @@ module Ci def play(current_user = nil) # Try to queue a current build - if self.queue + if self.enqueue self.update(user: current_user) self else |