Skip to content

G
gitlab-ce
Commit 117ab089 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/services/ci/process_build_service.rb

parent e36e1c35
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/services/ci/process_build_service.rb
View file @ 117ab089
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
module Ci module Ci
class ProcessBuildService < BaseService class ProcessBuildService < BaseService
<<<<<<< HEAD
prepend EE::Ci::ProcessBuildService prepend EE::Ci::ProcessBuildService
=======
>>>>>>> upstream/master
def execute(build, current_status) def execute(build, current_status)
if valid_statuses_for_when(build.when).include?(current_status) if valid_statuses_for_when(build.when).include?(current_status)
if build.schedulable? if build.schedulable?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7