diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-26 18:03:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-26 18:03:40 +0000 |
| commit | f2e9148d18c049bb699e60ed31d3804f9ae4b592 (patch) | |
| tree | ac2cb61e83d5c7077523c14f928ef6e11ec0384c /lib/api | |
| parent | 578064df4d58fb0409fec51fe03c4b95181a5f5f (diff) | |
| parent | c6c17f1ca636f879c245133cffeae531a7d3df55 (diff) | |
| download | gitlab-ce-f2e9148d18c049bb699e60ed31d3804f9ae4b592.tar.gz | |
Merge branch '42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master'
Adds trace of each access check when git push times out
Closes #42790
See merge request gitlab-org/gitlab-ce!22265
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/internal.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 4dd6b19e353..ae40b5f7557 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -65,6 +65,8 @@ module API result rescue Gitlab::GitAccess::UnauthorizedError => e break response_with_status(code: 401, success: false, message: e.message) + rescue Gitlab::GitAccess::TimeoutError => e + break response_with_status(code: 503, success: false, message: e.message) rescue Gitlab::GitAccess::NotFoundError => e break response_with_status(code: 404, success: false, message: e.message) end |