fixes conflicts

2016-01-25 22:24:58 +01:00
parent 6adcc6104c 8d54e51413
commit 0505be08e8
15 changed files with 189 additions and 27 deletions
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -35,7 +35,7 @@ class ProposalsController < ApplicationController
  private

    def proposal_params
-      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
+      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key, :geozone_id)
    end

    def resource_model