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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e358ae16
Commit
e358ae16
authored
Sep 12, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inline initialize_yaml_processor
parent
7600a646
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-5
No files found.
app/models/ci/pipeline.rb
View file @
e358ae16
...
@@ -464,7 +464,7 @@ module Ci
...
@@ -464,7 +464,7 @@ module Ci
return
@config_processor
if
defined?
(
@config_processor
)
return
@config_processor
if
defined?
(
@config_processor
)
@config_processor
||=
begin
@config_processor
||=
begin
initialize_yaml_processor
::
Gitlab
::
Ci
::
YamlProcessor
.
new
(
ci_yaml_file
,
{
project:
project
,
sha:
sha
})
rescue
Gitlab
::
Ci
::
YamlProcessor
::
ValidationError
=>
e
rescue
Gitlab
::
Ci
::
YamlProcessor
::
ValidationError
=>
e
self
.
yaml_errors
=
e
.
message
self
.
yaml_errors
=
e
.
message
nil
nil
...
@@ -474,10 +474,6 @@ module Ci
...
@@ -474,10 +474,6 @@ module Ci
end
end
end
end
def
initialize_yaml_processor
::
Gitlab
::
Ci
::
YamlProcessor
.
new
(
ci_yaml_file
,
{
project:
project
,
sha:
sha
})
end
def
ci_yaml_file_path
def
ci_yaml_file_path
if
project
.
ci_config_path
.
blank?
if
project
.
ci_config_path
.
blank?
'.gitlab-ci.yml'
'.gitlab-ci.yml'
...
...
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