diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-12-20 15:24:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-12-20 16:40:51 +0100 |
| commit | 047b7e506e2603f33ecf14fea43969ccb2954a82 (patch) | |
| tree | 4cc695ec40e6d3ee2433b624b8bec7bd11df5c09 /app/models/concerns | |
| parent | f6dd6e566a2c656f97cf7c78df482bd4ec77d006 (diff) | |
| download | gitlab-ce-047b7e506e2603f33ecf14fea43969ccb2954a82.tar.gz | |
Allow truncated_diff_lines to be called on image diff discussion
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/discussion_on_diff.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/discussion_on_diff.rb b/app/models/concerns/discussion_on_diff.rb index 266c37fa3a1..86b61248534 100644 --- a/app/models/concerns/discussion_on_diff.rb +++ b/app/models/concerns/discussion_on_diff.rb @@ -39,6 +39,7 @@ module DiscussionOnDiff # Returns an array of at most 16 highlighted lines above a diff note def truncated_diff_lines(highlight: true, diff_limit: nil) + return [] unless on_text? return [] if diff_line.nil? && first_note.is_a?(LegacyDiffNote) diff_limit = [diff_limit, NUMBER_OF_TRUNCATED_DIFF_LINES].compact.min |