diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 19:33:45 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b (patch) | |
| tree | c63719f281b3e38c149ce8a7425d826850914f80 /app/views/discussions | |
| parent | 2058e71e63c9ac471137f831b4d04b6626968532 (diff) | |
| download | gitlab-ce-bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b.tar.gz | |
Don't use original_discussion_id
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 38112f67881..e04958817e4 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -5,7 +5,7 @@ = link_to user_path(discussion.author) do = image_tag avatar_icon(discussion.author), class: "avatar s40" .timeline-content - .discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } } + .discussion.js-toggle-container{ data: { discussion_id: discussion.id } } .discussion-header .discussion-actions %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button" } diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index d7b2abf1269..ad778612f92 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -1,4 +1,4 @@ -%ul.notes{ data: { discussion_id: discussion.id, original_discussion_id: discussion.original_id } } +%ul.notes{ data: { discussion_id: discussion.id } } = render partial: "projects/notes/note", collection: discussion.notes, as: :note - if current_user |