diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-09-28 11:11:10 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-28 15:53:53 +0100 |
| commit | e38fcc8cfdbc9c4691022532dd2cee8dace20a1c (patch) | |
| tree | 8ba578f5a5d89c65ea8df7060012a57ed335b8ed /app/models/merge_request.rb | |
| parent | 3cf5eba3d4d518b48b88331dd57d766046f42fff (diff) | |
| download | gitlab-ce-38319-9-5-stable.tar.gz | |
Handle error when fetching ref for MR with deleted source branch38319-9-5-stable
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 5043711c2ea..74ea71a52c3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -950,8 +950,6 @@ class MergeRequest < ActiveRecord::Base source_project.repository, source_branch) do |commit| if commit target_project.repository.write_ref(ref_path, commit.sha) - else - raise Rugged::ReferenceError, 'source repository is empty' end end end |