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
a5cf5afd
Commit
a5cf5afd
authored
Sep 11, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stack rescue blocks for Gitlab::Ci::Config#initialize
parent
0df8e09f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
lib/gitlab/ci/config.rb
lib/gitlab/ci/config.rb
+8
-10
No files found.
lib/gitlab/ci/config.rb
View file @
a5cf5afd
...
@@ -7,7 +7,6 @@ module Gitlab
...
@@ -7,7 +7,6 @@ module Gitlab
ConfigError
=
Class
.
new
(
StandardError
)
ConfigError
=
Class
.
new
(
StandardError
)
def
initialize
(
config
,
opts
=
{})
def
initialize
(
config
,
opts
=
{})
begin
@config
=
Config
::
Extendable
@config
=
Config
::
Extendable
.
new
(
build_config
(
config
,
opts
))
.
new
(
build_config
(
config
,
opts
))
.
to_hash
.
to_hash
...
@@ -16,7 +15,6 @@ module Gitlab
...
@@ -16,7 +15,6 @@ module Gitlab
@global
.
compose!
@global
.
compose!
rescue
Loader
::
FormatError
,
Extendable
::
ExtensionError
=>
e
rescue
Loader
::
FormatError
,
Extendable
::
ExtensionError
=>
e
raise
Config
::
ConfigError
,
e
.
message
raise
Config
::
ConfigError
,
e
.
message
end
rescue
::
Gitlab
::
Ci
::
External
::
Processor
::
FileError
=>
e
rescue
::
Gitlab
::
Ci
::
External
::
Processor
::
FileError
=>
e
raise
::
Gitlab
::
Ci
::
YamlProcessor
::
ValidationError
,
e
.
message
raise
::
Gitlab
::
Ci
::
YamlProcessor
::
ValidationError
,
e
.
message
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