Merge branch 'master' into polls_minor_changes

2017-10-03 16:22:33 +02:00
parent 2cb620296b 21e14776fc
commit 05d40c0ede
47 changed files with 559 additions and 173 deletions
--- a/app/models/abilities/administrator.rb
+++ b/app/models/abilities/administrator.rb
@@ -45,7 +45,7 @@ module Abilities

      can [:read, :update, :valuate, :destroy, :summary], SpendingProposal

-      can [:index, :read, :new, :create, :update, :destroy, :calculate_winners], Budget
+      can [:index, :read, :new, :create, :update, :destroy, :calculate_winners, :read_results], Budget
      can [:read, :create, :update, :destroy], Budget::Group
      can [:read, :create, :update, :destroy], Budget::Heading
      can [:hide, :update, :toggle_selection], Budget::Investment