merges master and fixes conflicts

2015-07-29 17:13:09 +02:00
parent 63cac453e6 5362ce96d6
commit c495d4678c
41 changed files with 428 additions and 109 deletions
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -5,7 +5,7 @@
    <%= f.text_area :body %>
    <%= f.hidden_field :commentable_type, value: parent.class %>
    <%= f.hidden_field :commentable_id, value: parent.id %>
-    
-    <%= f.submit comment_button_text(parent), :class => "button radius" %>
+
+    <%= f.submit comment_button_text(parent), class: "button radius" %>
  <% end %>
 </div>