Merge branch 'master' into dashboard

2019-03-26 16:45:48 +01:00
parent 505365f0fa 1b76a34074
commit eda6ea7f12
2476 changed files with 62613 additions and 84405 deletions
--- a/config/routes/proposal.rb
+++ b/config/routes/proposal.rb
@@ -39,6 +39,6 @@ resources :proposals do
    get :map
    get :suggest
    get :summary
-    put 'recommendations/disable', only: :index, controller: 'proposals', action: :disable_recommendations
+    put "recommendations/disable", only: :index, controller: "proposals", action: :disable_recommendations
  end
 end