Skip to content

G
gitlab-ce
Commit fde1a9c0 authored by Ian Baum's avatar Ian Baum
Browse files
Options

Resolving conflict with app/models/ci/pipeline.rb

parent 6d16a164
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
app/models/ci/pipeline.rb
View file @ fde1a9c0
...@@ -406,13 +406,8 @@ module Ci ...@@ -406,13 +406,8 @@ module Ci
return @config_processor if defined?(@config_processor) return @config_processor if defined?(@config_processor)
@config_processor ||= begin @config_processor ||= begin
<<<<<<< HEAD
initialize_yaml_processor
rescue Gitlab::Ci::YamlProcessor::ValidationError, Psych::SyntaxError => e
=======
Gitlab::Ci::YamlProcessor.new(ci_yaml_file) Gitlab::Ci::YamlProcessor.new(ci_yaml_file)
rescue Gitlab::Ci::YamlProcessor::ValidationError => e rescue Gitlab::Ci::YamlProcessor::ValidationError => e
>>>>>>> upstream/master
self.yaml_errors = e.message self.yaml_errors = e.message
nil nil
rescue rescue
......
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