summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-08-25 14:57:57 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-09-07 12:10:49 +0200
commitcc06eab237a6fe5501fcfdb2d1f1e57f711b56f5 (patch)
tree02880b599fe1f53a8e00269c36cd64fe63ac93b7 /lib
parent9e313c129418f847498e771abd6bea53884682b5 (diff)
downloadgitlab-ce-cc06eab237a6fe5501fcfdb2d1f1e57f711b56f5.tar.gz
Change class method name
Diffstat (limited to 'lib')
-rw-r--r--lib/api/lint.rb6
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/lint.rb b/lib/api/lint.rb
index 2d27bc65462..379c266abe1 100644
--- a/lib/api/lint.rb
+++ b/lib/api/lint.rb
@@ -2,7 +2,7 @@ module API
class Lint < Grape::API
resource :lint do
params do
- requires :content, type: String, desc: 'content of .gitlab-ci.yml'
+ requires :content, type: String, desc: 'Content of .gitlab-ci.yml'
end
desc 'Validation of .gitlab-ci.yml content'
@@ -13,9 +13,9 @@ module API
jobs: []
}
- if Ci::GitlabCiYamlProcessor.validate(@content) != "valid"
+ if Ci::GitlabCiYamlProcessor.errors(@content) != nil
status 200
- response[:errors].push(e.message)
+ response[:errors].push(Ci::GitlabCiYamlProcessor.errors(@content))
response[:status] = 'invalid'
response
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 9799f494df6..40c84b93799 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -78,10 +78,10 @@ module Ci
}
end
- def self.validate(content)
+ def self.errors(content)
begin
Ci::GitlabCiYamlProcessor.new(content)
- "valid"
+ nil
rescue ValidationError, Psych::SyntaxError => e
e.message
end