diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:49:38 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:49:38 -0500 |
| commit | b8ca5c784ca8c5eea886f04c0b03cdac729bae9c (patch) | |
| tree | a089ad9ca85115f8a33b06ae79386e1c0eb72f08 /lib | |
| parent | 3114147b0e72c35abd48110bc17fe1c8be5ab396 (diff) | |
| download | gitlab-ce-b8ca5c784ca8c5eea886f04c0b03cdac729bae9c.tar.gz | |
Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing-9-2
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`. |