consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into followable

Browse Source
This commit is contained in:
BertoCQ
2017-07-11 11:30:49 +02:00
committed by GitHub
parent b0ee52556c 6285ad3b68
commit 204ea13c85
85 changed files with 1251 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/abilities/administrator.rb
View File

@@ -32,7 +32,8 @@ module Abilities
can :mark_featured, Debate
can :unmark_featured, Debate
can :comment_as_administrator, [Debate, Comment, Proposal, Poll::Question, Budget::Investment, Legislation::Question, Legislation::Annotation]
can :comment_as_administrator, [Debate, Comment, Proposal, Poll::Question, Budget::Investment,
Legislation::Question, Legislation::Annotation]
can [:search, :create, :index, :destroy], ::Administrator
can [:search, :create, :index, :destroy], ::Moderator

3
app/models/abilities/moderator.rb
View File

@@ -5,7 +5,8 @@ module Abilities
def initialize(user)
merge Abilities::Moderation.new(user)
can :comment_as_moderator, [Debate, Comment, Proposal, Budget::Investment, Poll::Question, Legislation::Question, Legislation::Annotation]
can :comment_as_moderator, [Debate, Comment, Proposal, Budget::Investment, Poll::Question,
Legislation::Question, Legislation::Annotation]
end
end
end