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
7143bb88
Commit
7143bb88
authored
6 years ago
by
Francisco Javier López
Committed by
Douwe Maan
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added rescue to show a custom error when testing project integrations
parent
2e3bc6a9
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
app/controllers/projects/services_controller.rb
app/controllers/projects/services_controller.rb
+2
-0
No files found.
app/controllers/projects/services_controller.rb
View file @
7143bb88
...
@@ -46,6 +46,8 @@ class Projects::ServicesController < Projects::ApplicationController
...
@@ -46,6 +46,8 @@ class Projects::ServicesController < Projects::ApplicationController
else
else
{
error:
true
,
message:
'Validations failed.'
,
service_response:
@service
.
errors
.
full_messages
.
join
(
','
)
}
{
error:
true
,
message:
'Validations failed.'
,
service_response:
@service
.
errors
.
full_messages
.
join
(
','
)
}
end
end
rescue
Gitlab
::
HTTP
::
BlockedUrlError
=>
e
{
error:
true
,
message:
'Test failed.'
,
service_response:
e
.
message
}
end
end
def
success_message
def
success_message
...
...
This diff is collapsed.
Click to expand it.
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