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
Boxiang Sun
gitlab-ce
Commits
8248314b
Commit
8248314b
authored
Nov 19, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't rescue Exception, but StandardError
parent
a5b10196
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
app/controllers/ci/lints_controller.rb
app/controllers/ci/lints_controller.rb
+2
-2
app/models/ci/commit.rb
app/models/ci/commit.rb
+3
-6
No files found.
app/controllers/ci/lints_controller.rb
View file @
8248314b
...
@@ -15,10 +15,10 @@ module Ci
...
@@ -15,10 +15,10 @@ module Ci
@builds
=
@config_processor
.
builds
@builds
=
@config_processor
.
builds
@status
=
true
@status
=
true
end
end
rescue
Ci
::
GitlabCiYamlProcessor
::
ValidationError
=>
e
rescue
Ci
::
GitlabCiYamlProcessor
::
ValidationError
,
Psych
::
SyntaxError
=>
e
@error
=
e
.
message
@error
=
e
.
message
@status
=
false
@status
=
false
rescue
Exception
rescue
@error
=
"Undefined error"
@error
=
"Undefined error"
@status
=
false
@status
=
false
end
end
...
...
app/models/ci/commit.rb
View file @
8248314b
...
@@ -190,14 +190,11 @@ module Ci
...
@@ -190,14 +190,11 @@ module Ci
def
config_processor
def
config_processor
return
nil
unless
ci_yaml_file
return
nil
unless
ci_yaml_file
@config_processor
||=
Ci
::
GitlabCiYamlProcessor
.
new
(
ci_yaml_file
,
gl_project
.
path_with_namespace
)
@config_processor
||=
Ci
::
GitlabCiYamlProcessor
.
new
(
ci_yaml_file
,
gl_project
.
path_with_namespace
)
rescue
Ci
::
GitlabCiYamlProcessor
::
ValidationError
=>
e
rescue
Ci
::
GitlabCiYamlProcessor
::
ValidationError
,
Psych
::
SyntaxError
=>
e
save_yaml_error
(
e
.
message
)
save_yaml_error
(
e
.
message
)
nil
nil
rescue
Psych
::
SyntaxError
=>
e
rescue
save_yaml_error
(
e
.
message
)
save_yaml_error
(
"Undefined error"
)
nil
rescue
Exception
save_yaml_error
(
"Undefined yaml error"
)
nil
nil
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