summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-09-12 18:44:35 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-09-12 18:44:35 +0200
commite358ae16b45602666e959ada5a193c1cb4addb0f (patch)
tree2ec070de479d95d16f1ce589beb60a1ece08e57b
parent7600a6469bbd2975c80b48e6bb9b95af1e40795f (diff)
downloadgitlab-ce-e358ae16b45602666e959ada5a193c1cb4addb0f.tar.gz
Inline initialize_yaml_processor
-rw-r--r--app/models/ci/pipeline.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index bec0aff2ba0..8c075253400 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -464,7 +464,7 @@ module Ci
return @config_processor if defined?(@config_processor)
@config_processor ||= begin
- initialize_yaml_processor
+ ::Gitlab::Ci::YamlProcessor.new(ci_yaml_file, { project: project, sha: sha })
rescue Gitlab::Ci::YamlProcessor::ValidationError => e
self.yaml_errors = e.message
nil
@@ -474,10 +474,6 @@ module Ci
end
end
- def initialize_yaml_processor
- ::Gitlab::Ci::YamlProcessor.new(ci_yaml_file, { project: project, sha: sha })
- end
-
def ci_yaml_file_path
if project.ci_config_path.blank?
'.gitlab-ci.yml'