diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-03-29 08:23:47 +0200 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2018-03-29 08:23:47 +0200 |
| commit | a99f1b23bd586be6b67581fc128cfaa898cd4ae9 (patch) | |
| tree | 1df04404b4f94b8b5f8fa90f7df924f6a2b18c4b | |
| parent | d4f37e9fe6ff06dbdff2c2c82ecf6a5713d88615 (diff) | |
| download | gitlab-ce-dm-gitlab-http-blocked-url-error.tar.gz | |
Added rescue to show a custom error when testing project integrationsdm-gitlab-http-blocked-url-error
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index f14cb5f6a9f..a5ea9ff7ed7 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -46,6 +46,8 @@ class Projects::ServicesController < Projects::ApplicationController else { error: true, message: 'Validations failed.', service_response: @service.errors.full_messages.join(',') } end + rescue Gitlab::HTTP::BlockedUrlError => e + { error: true, message: 'Test failed.', service_response: e.message } end def success_message |