diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-07-11 02:13:50 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-07-11 11:39:37 +0300 |
| commit | 1a98116df61a30bc92c1edc9c8a25fef516d036d (patch) | |
| tree | 24feca4b4611154332e893f4148eb29d5ba5a4dc /app | |
| parent | 24aaeb92a7dda548f61c56d0c424c5ea935a07b3 (diff) | |
Merge branch 'sh-fix-git-gc-error-handling' into 'master'
Fix ArgumentError in GitGarbageCollectWorker Sidekiq job
Closes #49096
See merge request gitlab-org/gitlab-ce!20541
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/git_garbage_collect_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/git_garbage_collect_worker.rb b/app/workers/git_garbage_collect_worker.rb index fd49bc18161..2d381c6fd6c 100644 --- a/app/workers/git_garbage_collect_worker.rb +++ b/app/workers/git_garbage_collect_worker.rb @@ -65,10 +65,10 @@ class GitGarbageCollectWorker client.repack_incremental end rescue GRPC::NotFound => e - Gitlab::GitLogger.error("#{method} failed:\nRepository not found") + Gitlab::GitLogger.error("#{__method__} failed:\nRepository not found") raise Gitlab::Git::Repository::NoRepository.new(e) rescue GRPC::BadStatus => e - Gitlab::GitLogger.error("#{method} failed:\n#{e}") + Gitlab::GitLogger.error("#{__method__} failed:\n#{e}") raise Gitlab::Git::CommandError.new(e) end |