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/moderation.rb
+++ b/config/routes/moderation.rb
@@ -30,7 +30,7 @@ namespace :moderation do

  resources :administrator_tasks, only: %i[index edit update]

-  resources :budget_investments, only: :index, controller: 'budgets/investments' do
+  resources :budget_investments, only: :index, controller: "budgets/investments" do
    put :hide, on: :member
    put :moderate, on: :collection
  end