diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 23:48:42 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 23:48:42 +0300 |
| commit | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (patch) | |
| tree | 673deb5b6d8047b511ff01e9d7c1110fc4f0812a /lib | |
| parent | b46b52af37fd8c800e8fdca5de25be31415c7d5d (diff) | |
Stop MR conflict code from blowing up when branches are missing
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`. |