diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-03 23:03:05 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-03 23:03:05 +0000 |
| commit | aa9e77b7ce5a1ceeff6188e5d12e5fcb2589d2f1 (patch) | |
| tree | 2f324f6ab2493dbbf92904547bbd852220c27752 /app/views/projects/blob | |
| parent | 575aea54e4ab83c93cd69413479372815cd287c5 (diff) | |
| parent | ece2e80bf88c594b454d8dce9d040f99725ef535 (diff) | |
| download | gitlab-ce-aa9e77b7ce5a1ceeff6188e5d12e5fcb2589d2f1.tar.gz | |
Merge branch '26300-line-numbers-are-off-in-dynamically-loaded-diff-chunks' into 'master'
Resolve "Line numbers are off in dynamically loaded diff chunks"
Closes #26300
See merge request !8428
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/diff.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blob/diff.html.haml b/app/views/projects/blob/diff.html.haml index 538f8591f13..3b1a2e54ec2 100644 --- a/app/views/projects/blob/diff.html.haml +++ b/app/views/projects/blob/diff.html.haml @@ -27,4 +27,4 @@ - if @form.unfold? && @form.bottom? && @form.to < @blob.loc %tr.line_holder{ id: @form.to, class: line_class } - = diff_match_line @form.to, @form.to, text: @match_line, view: diff_view, bottom: true + = diff_match_line @form.to - @form.offset, @form.to, text: @match_line, view: diff_view, bottom: true |