summaryrefslogtreecommitdiff
path: root/app/views/discussions
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-14 16:55:44 +0100
committerDouwe Maan <douwe@selenight.nl>2016-07-24 13:12:59 -0600
commit44cb5803a15ebbe322ac494ff03cfd5cfea2e9dd (patch)
tree3236f8f670429116a58fb3503b02bfe3f7f95d65 /app/views/discussions
parentc1fe066b4b0d822950ec67179c11ca19f3de5dd6 (diff)
downloadgitlab-ce-44cb5803a15ebbe322ac494ff03cfd5cfea2e9dd.tar.gz
Seperated resolve all button from reply button
Diffstat (limited to 'app/views/discussions')
-rw-r--r--app/views/discussions/_diff_discussion.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml
index b9bc8a6304e..e59f7e6373d 100644
--- a/app/views/discussions/_diff_discussion.html.haml
+++ b/app/views/discussions/_diff_discussion.html.haml
@@ -5,8 +5,8 @@
= render partial: "projects/notes/note", collection: discussion.notes, as: :note
.discussion-reply-holder
- .btn-group-justified.discussion-with-resolve-btn{ role: "group" }
- .btn-group{ role: "group" }
+ .discussion-with-resolve-btn{ role: "group" }
+ .btn-group
= link_to_reply_discussion(note)
- .btn-group{ role: "group" }
+ .btn-group
= render "projects/notes/discussions/resolve_all", note: note