summaryrefslogtreecommitdiff
path: root/app/views/discussions
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-26 15:47:19 +0100
committerPhil Hughes <me@iamphill.com>2016-07-26 15:47:19 +0100
commita678fef83611ea873d252941586c18171cd6ba07 (patch)
treed329b902a7784b4a6be14980f8a94647a8fb9a00 /app/views/discussions
parent5e8606562df861e22d80e888457300f862aeb89b (diff)
downloadgitlab-ce-a678fef83611ea873d252941586c18171cd6ba07.tar.gz
Added resolved by users name into tooltip
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 6c4e37be854..22eca5d8e7c 100644
--- a/app/views/discussions/_resolve_all.html.haml
+++ b/app/views/discussions/_resolve_all.html.haml
@@ -1,4 +1,4 @@
-- if discussion.can_resolve?(current_user)
+- if discussion.can_resolve?(current_user) && discussion.resolvable?
%resolve-all-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'",
":project-path" => "'#{discussion.project.path}'",
":discussion-id" => "'#{discussion.id}'",