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/app/models/abilities/common.rb
+++ b/app/models/abilities/common.rb
@@ -116,9 +116,6 @@ module Abilities

      can [:create, :show], ProposalNotification, proposal: { author_id: user.id }

-      can :create, Annotation
-      can [:update, :destroy], Annotation, user_id: user.id
-
      can [:create], Topic
      can [:update, :destroy], Topic, author_id: user.id