summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
diff options
context:
space:
mode:
authorPatrick Bajao <ebajao@gitlab.com>2019-07-01 17:11:15 +0800
committerPatrick Bajao <ebajao@gitlab.com>2019-07-01 17:57:41 +0800
commit3d701a7ccc8380ef230357363069d9fb0f5fe574 (patch)
treed6cd5d57a081da7df8b523a2d17baec81d04c912 /lib/gitlab/diff
parent8775e4a1faf13a01451e71ea9ef729dc52e6d3c1 (diff)
downloadgitlab-ce-3d701a7ccc8380ef230357363069d9fb0f5fe574.tar.gz
Don't show image diff note on text file58808-fix-image-diff-on-text
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r--lib/gitlab/diff/lines_unfolder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/lines_unfolder.rb b/lib/gitlab/diff/lines_unfolder.rb
index 6cf904b2b2a..0bd18fe9622 100644
--- a/lib/gitlab/diff/lines_unfolder.rb
+++ b/lib/gitlab/diff/lines_unfolder.rb
@@ -54,7 +54,7 @@ module Gitlab
def unfold_required?
strong_memoize(:unfold_required) do
next false unless @diff_file.text?
- next false unless @position.unchanged?
+ next false unless @position.on_text? && @position.unchanged?
next false if @diff_file.new_file? || @diff_file.deleted_file?
next false unless @position.old_line
# Invalid position (MR import scenario)