diff options
| author | Phil Hughes <me@iamphill.com> | 2017-02-08 14:58:08 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-02-09 15:54:19 +0000 |
| commit | f9c58d938851ca63b8c4ff5d2bf9324aa6541170 (patch) | |
| tree | 713127bf117b0318c296870f9717b5f7542a176c /app/views/discussions | |
| parent | 4975f4160ac65b3d9ae51d074efcb61bb63cf6b4 (diff) | |
| download | gitlab-ce-f9c58d938851ca63b8c4ff5d2bf9324aa6541170.tar.gz | |
Refactored diff notes Vue app
It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_resolve_all.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml index f0b61e0f7de..e30ee1b0e05 100644 --- a/app/views/discussions/_resolve_all.html.haml +++ b/app/views/discussions/_resolve_all.html.haml @@ -1,6 +1,5 @@ - if discussion.for_merge_request? - %resolve-discussion-btn{ ":project-path" => "'#{project_path(discussion.project)}'", - ":discussion-id" => "'#{discussion.id}'", + %resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", ":merge-request-id" => discussion.noteable.iid, ":can-resolve" => discussion.can_resolve?(current_user), "inline-template" => true } |