Merge branch 'master' into moderator_comments

2015-08-24 19:01:49 +02:00
parent 82fb56e4c0 26433b6a9a
commit 6d93f975e3
14 changed files with 63 additions and 22 deletions
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -89,9 +89,7 @@
            <%= link_to(comment_link_text(comment), "",
                        class: "js-add-comment-link", data: {'id': dom_id(comment)}) %>

-            <% if moderator? %>
-               <%= render 'comments/actions', comment: comment %>
-            <% end %>
+            <%= render 'comments/actions', comment: comment %>

            <%= render 'comments/form', {parent: comment, toggeable: true} %>
          <% end %>