Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00
parent 0e9cec2ca6 c918c9e081
commit 113f9b32d7
254 changed files with 10658 additions and 871 deletions
--- a/app/models/abilities/everyone.rb
+++ b/app/models/abilities/everyone.rb
@@ -8,10 +8,15 @@ module Abilities
      can :read, Comment
      can :read, Poll
      can :read, Poll::Question
+      can [:read, :welcome], Budget
+      can :read, Budget::Investment
      can :read, SpendingProposal
      can :read, Legislation
      can :read, User
      can [:search, :read], Annotation
+      can [:read], Budget
+      can [:read], Budget::Group
+      can [:read, :print], Budget::Investment
      can :new, DirectMessage
    end
  end