Merge branch 'master' into improving_debates

Conflicts: app/assets/stylesheets/debates.scss app/assets/stylesheets/participacion.scss
2015-08-15 01:45:56 +02:00
parent 3ab3285ce4 7919460554
commit 09d71ad84f
17 changed files with 43 additions and 27 deletions
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -14,7 +14,7 @@
      <h1><%= @debate.title %></h1>

      <div class="debate-info">
-        <%= image_tag('user_default.jpg', class: 'author-photo', size: '32x32') %>
+        <%= avatar_image(@debate.author, size: 32, class: 'author-photo') %>
        <span class="author">
            <%= @debate.author.name %>
        </span>