BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fa097c67
Commit
fa097c67
authored
Jun 07, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicated exception in Ci config
This is a temporary refactoring stub, that is planned to be removed after removing legacy config processor.
parent
23030439
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+1
-1
config.rb
lib/gitlab/ci/config.rb
+0
-5
config_spec.rb
spec/lib/gitlab/ci/config_spec.rb
+2
-1
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
fa097c67
...
...
@@ -18,7 +18,7 @@ module Ci
initial_parsing
validate!
rescue
Gitlab
::
Ci
::
Config
::
LoaderError
=>
e
rescue
Gitlab
::
Ci
::
Config
::
Loader
::
Format
Error
=>
e
raise
ValidationError
,
e
.
message
end
...
...
lib/gitlab/ci/config.rb
View file @
fa097c67
...
...
@@ -5,11 +5,6 @@ module Gitlab
def
initialize
(
config
)
loader
=
Loader
.
new
(
config
)
unless
loader
.
valid?
raise
LoaderError
,
'Invalid configuration format!'
end
@config
=
loader
.
load
end
...
...
spec/lib/gitlab/ci/config_spec.rb
View file @
fa097c67
...
...
@@ -37,7 +37,8 @@ describe Gitlab::Ci::Config do
describe
'.new'
do
it
'raises error'
do
expect
{
config
}.
to
raise_error
(
Gitlab
::
Ci
::
Config
::
LoaderError
,
/Invalid configuration format/
Gitlab
::
Ci
::
Config
::
Loader
::
FormatError
,
/Invalid configuration format/
)
end
end
...
...
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