diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-04 18:10:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-04 18:10:36 +0300 |
commit | be4b3134a282f7a8812306777abd2d3150deecdc (patch) | |
tree | 0563327ce590b415047686c6feff43496742b49a /lib/gitlab/phabricator_import | |
parent | 998adcc422d4161515bf2960ef4dce71258f69a3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/phabricator_import')
-rw-r--r-- | lib/gitlab/phabricator_import/conduit/client.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/phabricator_import/conduit/response.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/phabricator_import/conduit/client.rb b/lib/gitlab/phabricator_import/conduit/client.rb index 4469a3f5849..5945cde9618 100644 --- a/lib/gitlab/phabricator_import/conduit/client.rb +++ b/lib/gitlab/phabricator_import/conduit/client.rb @@ -13,7 +13,7 @@ module Gitlab Response.parse!(response) rescue *Gitlab::HTTP::HTTP_ERRORS => e # Wrap all errors from the API into an API-error. - raise ApiError.new(e) + raise ApiError, e end private diff --git a/lib/gitlab/phabricator_import/conduit/response.rb b/lib/gitlab/phabricator_import/conduit/response.rb index 1b03cfa05e6..26037ba183e 100644 --- a/lib/gitlab/phabricator_import/conduit/response.rb +++ b/lib/gitlab/phabricator_import/conduit/response.rb @@ -18,7 +18,7 @@ module Gitlab response rescue JSON::JSONError => e - raise ResponseError.new(e) + raise ResponseError, e end def initialize(json) |