Merge branch 'master' into feature/budget_phases

2018-01-16 17:47:47 +01:00
parent 005d08e718 a215c9c603
commit d44db9cec4
26 changed files with 166 additions and 76 deletions
--- a/app/controllers/admin/budgets_controller.rb
+++ b/app/controllers/admin/budgets_controller.rb
@@ -2,7 +2,7 @@ class Admin::BudgetsController < Admin::BaseController
  include FeatureFlags
  feature_flag :budgets

-  has_filters %w{current finished}, only: :index
+  has_filters %w{open finished}, only: :index

  load_and_authorize_resource