Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
0ce5cc99
Commit
0ce5cc99
authored
Apr 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve merge
parent
aca1e14b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
15 deletions
+0
-15
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+0
-15
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
0ce5cc99
...
@@ -120,17 +120,6 @@ module Ci
...
@@ -120,17 +120,6 @@ module Ci
true
true
end
end
def
validate_job!
(
name
,
job
)
validate_job_name!
(
name
)
validate_job_keys!
(
name
,
job
)
validate_job_types!
(
name
,
job
)
validate_job_stage!
(
name
,
job
)
if
job
[
:stage
]
validate_job_cache!
(
name
,
job
)
if
job
[
:cache
]
validate_job_artifacts!
(
name
,
job
)
if
job
[
:artifacts
]
validate_job_dependencies!
(
name
,
job
)
if
job
[
:dependencies
]
end
private
private
def
validate_global!
def
validate_global!
...
@@ -170,12 +159,9 @@ module Ci
...
@@ -170,12 +159,9 @@ module Ci
raise
ValidationError
,
"cache:untracked parameter should be an boolean"
raise
ValidationError
,
"cache:untracked parameter should be an boolean"
end
end
<<<<<<<
HEAD
if
@cache
[
:paths
]
&&
!
validate_array_of_strings
(
@cache
[
:paths
])
if
@cache
[
:paths
]
&&
!
validate_array_of_strings
(
@cache
[
:paths
])
raise
ValidationError
,
"cache:paths parameter should be an array of strings"
raise
ValidationError
,
"cache:paths parameter should be an array of strings"
end
end
=======
true
end
end
def
validate_job!
(
name
,
job
)
def
validate_job!
(
name
,
job
)
...
@@ -188,7 +174,6 @@ module Ci
...
@@ -188,7 +174,6 @@ module Ci
validate_job_cache!
(
name
,
job
)
if
job
[
:cache
]
validate_job_cache!
(
name
,
job
)
if
job
[
:cache
]
validate_job_artifacts!
(
name
,
job
)
if
job
[
:artifacts
]
validate_job_artifacts!
(
name
,
job
)
if
job
[
:artifacts
]
validate_job_dependencies!
(
name
,
job
)
if
job
[
:dependencies
]
validate_job_dependencies!
(
name
,
job
)
if
job
[
:dependencies
]
>>>>>>>
origin
/
master
end
end
def
validate_job_name!
(
name
)
def
validate_job_name!
(
name
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment