diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-25 19:27:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-25 19:27:59 +0000 |
| commit | b7013252f80ce3220996e9f49190b60a6d15e64f (patch) | |
| tree | fb24fba48b7a64a01a45bcb3b1a6c0be2565742f | |
| parent | a55697e9edf97cd04a6d8db665a6aeb8c3784eec (diff) | |
| parent | e4af5c50a80f7d769ca474874a84b1f481dbb8b4 (diff) | |
| download | gitlab-shell-b7013252f80ce3220996e9f49190b60a6d15e64f.tar.gz | |
Merge branch 'add-http-gateway-time-out-handling' into 'master'
Adds handling of Net::HTTPGatewayTimeOut exception to GitlabNet
See merge request gitlab-org/gitlab-shell!251
| -rw-r--r-- | lib/gitlab_net.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index b460f46..ac98e9f 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -36,7 +36,7 @@ class GitlabNet # rubocop:disable Metrics/ClassLength case resp when Net::HTTPSuccess, Net::HTTPMultipleChoices, Net::HTTPUnauthorized, - Net::HTTPNotFound + Net::HTTPNotFound, Net::HTTPServiceUnavailable if resp.content_type == CONTENT_TYPE_JSON return GitAccessStatus.create_from_json(resp.body, resp.code) end |