Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-26 01:15:57 +0300
committerRobert Speicher <robert@gitlab.com>2017-05-26 01:15:57 +0300
commit8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3 (patch)
tree2fe8ce678f1183fe778454dfa39e3dcc277d3fd8 /app/views/discussions
parente20eb71203aa29458d7f51a27d42a3d8208e2494 (diff)
parentd88a5c1db1c6cca639039188a26c6e6d5bc68831 (diff)
Merge branch 'dm-diff-cleanup' into 'master'
Clean up diff rendering See merge request !11390
Diffstat (limited to 'app/views/discussions')
-rw-r--r--app/views/discussions/_diff_with_notes.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml
index c3f55ff821f..70042dee20f 100644
--- a/app/views/discussions/_diff_with_notes.html.haml
+++ b/app/views/discussions/_diff_with_notes.html.haml
@@ -3,7 +3,7 @@
.diff-file.file-holder
.js-file-title.file-title
- = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_file.content_commit, project: discussion.project, url: discussion_path(discussion), show_toggle: false
+ = render "projects/diffs/file_header", diff_file: diff_file, url: discussion_path(discussion), show_toggle: false
.diff-content.code.js-syntax-highlight
%table