Merge branch 'master' into user-recomendations

2017-09-19 18:56:12 +02:00
parent 87c99018e7 f99612d619
commit f67ba62c49
46 changed files with 221 additions and 223 deletions
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -78,7 +78,7 @@ class ProposalsController < ApplicationController
    def proposal_params
      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url,
                                       :responsible_name, :tag_list, :terms_of_service, :geozone_id,
-                                       documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] )
+                                       documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id])
    end

    def retired_params