Resolve conflicts in app/models/commit_status.rb

ae303175 · Stan Hu · cb005bb1 · ae303175
Commit ae303175 authored Oct 28, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

app/models/commit_status.rb app/models/commit_status.rb +1 -6

No files found.
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -52,14 +52,9 @@ class CommitStatus < ActiveRecord::Base
    runner_system_failure: 4,
    missing_dependency_failure: 5,
    runner_unsupported: 6,
-<<<<<<< HEAD
-    stale_schedule: 7
-  }.merge(EE_FAILURE_REASONS)
-=======
    stale_schedule: 7,
    job_execution_timeout: 8
-  }
+  }.merge(EE_FAILURE_REASONS)
->>>>>>> upstream/master
  ##
  # We still create some CommitStatuses outside of CreatePipelineService.