diff options
| author | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-19 05:12:47 +0300 |
|---|---|---|
| committer | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-19 05:12:47 +0300 |
| commit | e2d7eb8863abd445ddf0b5b83c01d0b5c4da67dd (patch) | |
| tree | f7567a28b271e9d335c41160eb4f290cde735435 /lib | |
| parent | 8e225051f46ecdcc1ec0fecdf615b1a3e15e655b (diff) | |
| parent | b8ca5c784ca8c5eea886f04c0b03cdac729bae9c (diff) | |
Merge branch 'dm-no-conflicts-when-branches-are-missing-9-2' into '9-2-stable'
Stop MR conflict code from blowing up when branches are missing (9.2)
See merge request !11502
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`. |