diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-19 01:13:20 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-19 01:13:20 +0300 |
| commit | bcc504d3c3ed0436935ca076d6be5db5ca10a664 (patch) | |
| tree | 88abcddab66bde62a1177548c2f785dddf42282c /lib | |
| parent | e5cc8e0aa81c3012eff5303543b11931158478cf (diff) | |
| parent | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (diff) | |
Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'
Stop MR conflict code from blowing up when branches are missing
Closes #32544
See merge request !11501
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/position_tracer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/position_tracer.rb b/lib/gitlab/diff/position_tracer.rb index c7542a8fabc..e89ff238ec7 100644 --- a/lib/gitlab/diff/position_tracer.rb +++ b/lib/gitlab/diff/position_tracer.rb @@ -16,7 +16,7 @@ module Gitlab end def trace(old_position) - return unless old_diff_refs.complete? && new_diff_refs.complete? + return unless old_diff_refs&.complete? && new_diff_refs&.complete? return unless old_position.diff_refs == old_diff_refs # Suppose we have an MR with source branch `feature` and target branch `master`. |