summaryrefslogtreecommitdiff
path: root/app/views/discussions
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-29 11:19:56 +0100
committerPhil Hughes <me@iamphill.com>2016-07-29 11:19:56 +0100
commitefb74875cfe1a1e2b3696f0129b819fc8e204876 (patch)
tree53bc2e8a9e45f6c31dcc729bf4646532c1e6b41a /app/views/discussions
parentd9a949c17c29c8531b2b0a1c227ab0b3341f0ba3 (diff)
downloadgitlab-ce-efb74875cfe1a1e2b3696f0129b819fc8e204876.tar.gz
Moved most of the data handling into discussion & notes models
Reduced some duplicated code with compiling components Fixed bug with resolve button tooltip not updating after resolving discussion
Diffstat (limited to 'app/views/discussions')
-rw-r--r--app/views/discussions/_resolve_all.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml
index 9a75a573828..9eef367716f 100644
--- a/app/views/discussions/_resolve_all.html.haml
+++ b/app/views/discussions/_resolve_all.html.haml
@@ -1,5 +1,5 @@
- if discussion.can_resolve?(current_user)
- %resolve-all-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'",
+ %resolve-discussion-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'",
":project-path" => "'#{discussion.project.path}'",
":discussion-id" => "'#{discussion.id}'",
":merge-request-id" => "#{discussion.noteable.iid}",