Merge branch 'master' into 1954-remove_question_show_and_description

2017-10-03 22:33:08 +02:00
parent 81e9682aa3 c7f576aa4f
commit 80c8fa308f
34 changed files with 134 additions and 222 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -273,9 +273,7 @@ Rails.application.routes.draw do

    scope module: :poll do
      resources :polls do
-        get :search_questions, on: :member
        patch :add_question, on: :member
-        patch :remove_question, on: :member

        resources :booth_assignments, only: [:index, :show, :create, :destroy] do
          get :search_booths, on: :collection