Merge with master

2017-09-28 13:36:20 +02:00
parent f67ba62c49 ea5a7af5fd
commit 92c774cdeb
183 changed files with 3101 additions and 1935 deletions
--- a/app/views/welcome/_recommended.html.erb
+++ b/app/views/welcome/_recommended.html.erb
@@ -19,8 +19,8 @@
        <% carousel_size = calculate_carousel_size(recommended_debates, recommended_proposals, false) %>
        <%= render "recommended_carousel", recommendeds: recommended_proposals,
                                           key: "proposals",
-                                           image_field: nil,
-                                           image_version: nil,
+                                           image_field: :attachment,
+                                           image_version: :thumb,
                                           image_default: nil,
                                           carousel_size: carousel_size,
                                           btn_text_link: t("welcome.recommended.proposals.btn_text_link"),