diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-06 17:59:09 -0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-06 17:59:09 -0200 |
| commit | 1bc0e9e3c5004d826768ff9e65aa236257a36302 (patch) | |
| tree | 0ad3bfeb37a51dace59502ca57941683ea0c7897 | |
| parent | ec66ef1b74fa431b18b23812a2a7cf881d1b98d8 (diff) | |
| download | gitlab-ce-1bc0e9e3c5004d826768ff9e65aa236257a36302.tar.gz | |
Apply additional guard-clauses for unfold_required?
| -rw-r--r-- | lib/gitlab/diff/lines_unfolder.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/diff/lines_unfolder.rb b/lib/gitlab/diff/lines_unfolder.rb index d87bb96a424..9306b7e16a2 100644 --- a/lib/gitlab/diff/lines_unfolder.rb +++ b/lib/gitlab/diff/lines_unfolder.rb @@ -54,7 +54,8 @@ module Gitlab def unfold_required? strong_memoize(:unfold_required) do next false unless @diff_file.text? - next false if @blob.nil? + next false unless @position.unchanged? + next false if @diff_file.new_file? || @diff_file.deleted_file? next false unless @position.old_line # Invalid position (MR import scenario) next false if @position.old_line > @blob.lines.size |