diff options
| author | Maxim Rydkin <maks.rydkin@gmail.com> | 2017-09-06 14:23:24 +0300 |
|---|---|---|
| committer | Maxim Rydkin <maks.rydkin@gmail.com> | 2017-09-12 22:32:02 +0300 |
| commit | c45ace8972f18af1f232f9074d6e4104fc4f0c14 (patch) | |
| tree | 0234b8da9c0eeafb67e1523b1d05d86ef33ca5c0 /app/models | |
| parent | c295d3362b610945de5c722616b39323a48c377e (diff) | |
| download | gitlab-ce-c45ace8972f18af1f232f9074d6e4104fc4f0c14.tar.gz | |
move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/blob_viewer/gitlab_ci_yml.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/blob_viewer/gitlab_ci_yml.rb b/app/models/blob_viewer/gitlab_ci_yml.rb index 7267c3965d3..53bc247dec1 100644 --- a/app/models/blob_viewer/gitlab_ci_yml.rb +++ b/app/models/blob_viewer/gitlab_ci_yml.rb @@ -13,7 +13,7 @@ module BlobViewer prepare! - @validation_message = Ci::GitlabCiYamlProcessor.validation_message(blob.data) + @validation_message = Gitlab::Ci::YamlProcessor.validation_message(blob.data) end def valid? diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 72946439d43..476db384bbd 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -336,8 +336,8 @@ module Ci return @config_processor if defined?(@config_processor) @config_processor ||= begin - Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.full_path) - rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e + Gitlab::Ci::YamlProcessor.new(ci_yaml_file, project.full_path) + rescue Gitlab::Ci::YamlProcessor::ValidationError, Psych::SyntaxError => e self.yaml_errors = e.message nil rescue |