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:
authorDouwe Maan <douwe@selenight.nl>2016-07-24 22:17:16 +0300
committerDouwe Maan <douwe@selenight.nl>2016-07-24 22:17:16 +0300
commit2ac009992373af60c284a985d76bd85bc7180690 (patch)
tree3481f9887a29d37df8c38c30f07355b61474bde1 /app/views/discussions/_parallel_diff_discussion.html.haml
parente28fb83410bf35a3fffb5e488fb1f07882056966 (diff)
Fix discussion partials
Diffstat (limited to 'app/views/discussions/_parallel_diff_discussion.html.haml')
-rw-r--r--app/views/discussions/_parallel_diff_discussion.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/discussions/_parallel_diff_discussion.html.haml b/app/views/discussions/_parallel_diff_discussion.html.haml
index 2ac85699417..773a50a221b 100644
--- a/app/views/discussions/_parallel_diff_discussion.html.haml
+++ b/app/views/discussions/_parallel_diff_discussion.html.haml
@@ -8,9 +8,9 @@
.discussion-reply-holder
.btn-group-justified.discussion-with-resolve-btn{ role: "group" }
.btn-group{ role: "group" }
- = link_to_reply_discussion(note_left, 'old')
+ = link_to_reply_discussion(discussion_left, 'old')
.btn-group{ role: "group" }
- = render "projects/notes/discussions/resolve_all", note: note_left
+ = render "discussions/resolve_all", discussion: discussion_left
- else
%td.notes_line.old= ""
%td.notes_content.parallel.old= ""
@@ -24,9 +24,9 @@
.discussion-reply-holder
.btn-group-justified.discussion-with-resolve-btn{ role: "group" }
.btn-group{ role: "group" }
- = link_to_reply_discussion(note_right, 'new')
+ = link_to_reply_discussion(discussion_right, 'new')
.btn-group{ role: "group" }
- = render "projects/notes/discussions/resolve_all", note: note_right
+ = render "discussions/resolve_all", discussion: discussion_right
- else
%td.notes_line.new= ""
%td.notes_content.parallel.new= ""