diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-05 10:18:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-05 10:18:53 +0000 |
| commit | fe695ebd24e59f82d16aba629dd6d117be3ee5bb (patch) | |
| tree | d983a8079fc7c8f3f9e2f62642c769a4a312613d /lib | |
| parent | 82967557aa596e762512502c4d1d0803806cc2fd (diff) | |
| parent | 590ffa957ff79168a844ab56ea4070d7b21f5422 (diff) | |
| download | gitlab-ce-fe695ebd24e59f82d16aba629dd6d117be3ee5bb.tar.gz | |
Merge branch 'issue_48474' into 'master'
Fix discussion entity for legacy diff notes
Closes #48474
See merge request gitlab-org/gitlab-ce!20214
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/file.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index a9e209d5b71..d16a55720b7 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -247,6 +247,7 @@ module Gitlab lines = highlighted_diff_lines return if lines.empty? + return if blob.nil? last_line = lines.last |