diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-19 15:08:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-19 15:08:27 +0300 |
commit | 4a44059e43feeef9e03fe99096de5035806c9f8f (patch) | |
tree | 4af11effe8e487422fe4dd1c815bd7635324415f /workhorse/internal/imageresizer | |
parent | 570f4d7ae78b453d9816f4f328bcd3941fbd0f37 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/imageresizer')
-rw-r--r-- | workhorse/internal/imageresizer/image_resizer.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/workhorse/internal/imageresizer/image_resizer.go b/workhorse/internal/imageresizer/image_resizer.go index 4a7e52d92d9..72f345239a6 100644 --- a/workhorse/internal/imageresizer/image_resizer.go +++ b/workhorse/internal/imageresizer/image_resizer.go @@ -20,8 +20,8 @@ import ( "gitlab.com/gitlab-org/labkit/tracing" "gitlab.com/gitlab-org/gitlab/workhorse/internal/config" - "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper/command" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper/fail" "gitlab.com/gitlab-org/gitlab/workhorse/internal/log" "gitlab.com/gitlab-org/gitlab/workhorse/internal/senddata" "gitlab.com/gitlab-org/gitlab/workhorse/internal/transport" @@ -420,7 +420,7 @@ func handleOutcome(w http.ResponseWriter, req *http.Request, startTime time.Time switch outcome.status { case statusRequestFailure: if outcome.bytesWritten <= 0 { - helper.Fail500WithFields(w, req, outcome.err, fields) + fail.Request(w, req, outcome.err, fail.WithFields(fields)) } else { log.WithError(outcome.err).Error(outcome.status) } |