diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-06 16:38:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-06 16:38:41 +0000 |
| commit | 9e8f3058af2bd5a80dbff7f84d8c192895cee7d0 (patch) | |
| tree | 1a0cb6f61a51aa2fd8476da4b06d5f5c9e5cd60f /lib | |
| parent | b81c6f142c38c9005b56ee5cf3677dac1b1adca8 (diff) | |
| parent | 30bca22d0841bfb2fdb6f5dc5970a4486614de4c (diff) | |
| download | gitlab-ce-9e8f3058af2bd5a80dbff7f84d8c192895cee7d0.tar.gz | |
Merge branch 'fix-500-error-when-mr-ref-is-not-yet-fetched' into 'master'
Fix 500 error when MR from fork has conflicts but worker has not run
See merge request gitlab-org/gitlab-ce!18226
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/conflict/resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/conflict/resolver.rb b/lib/gitlab/git/conflict/resolver.rb index 07b7e811a34..c3cb0264112 100644 --- a/lib/gitlab/git/conflict/resolver.rb +++ b/lib/gitlab/git/conflict/resolver.rb @@ -23,7 +23,7 @@ module Gitlab end rescue GRPC::FailedPrecondition => e raise Gitlab::Git::Conflict::Resolver::ConflictSideMissing.new(e.message) - rescue Rugged::OdbError, GRPC::BadStatus => e + rescue Rugged::ReferenceError, Rugged::OdbError, GRPC::BadStatus => e raise Gitlab::Git::CommandError.new(e) end |