diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-31 17:39:14 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-08 14:37:46 -0500 |
| commit | b202b42cfee6bb8cf0c142c918c545f45464a29c (patch) | |
| tree | bcdc1d30a4ec2c11fd4b388cac69a450051943e6 /app/views/projects/diffs | |
| parent | 3d1cade13f61115b63bf6dbda5a1f194ba54b24b (diff) | |
| download | gitlab-ce-b202b42cfee6bb8cf0c142c918c545f45464a29c.tar.gz | |
Link to outdated diff in older MR version from outdated diff discussion
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/diffs/_text_file.html.haml | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index f920f359de2..45c95f7ab6a 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -5,8 +5,7 @@ - left = line[:left] - right = line[:right] - last_line = right.new_pos if right - - unless @diff_notes_disabled - - discussions_left, discussions_right = parallel_diff_discussions(left, right, diff_file) + - discussions_left, discussions_right = parallel_diff_discussions(left, right, diff_file) %tr.line_holder.parallel - if left - case left.type diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml index ebd1a914ee7..5f3968b6709 100644 --- a/app/views/projects/diffs/_text_file.html.haml +++ b/app/views/projects/diffs/_text_file.html.haml @@ -4,11 +4,10 @@ %a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show. %table.text-file.code.js-syntax-highlight{ data: diff_view_data, class: too_big ? 'hide' : '' } - - discussions = @grouped_diff_discussions unless @diff_notes_disabled = render partial: "projects/diffs/line", collection: diff_file.highlighted_diff_lines, as: :line, - locals: { diff_file: diff_file, discussions: discussions } + locals: { diff_file: diff_file, discussions: @grouped_diff_discussions } - if !diff_file.new_file && !diff_file.deleted_file && diff_file.highlighted_diff_lines.any? - last_line = diff_file.highlighted_diff_lines.last |