Merge branch 'master' into user_openid_management

2017-06-13 10:25:08 +03:00 · 2017-06-13 10:25:08 +03:00 · 2e922650a7
commit 2e922650a7
parent 9d4d42341c 703dce4f5c
22 changed files with 426 additions and 30 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@ -83,6 +83,7 @@ class Ability
      conference.registration_open? && !conference.registration_limit_exceeded? || conference.program.speakers.confirmed.include?(user)
    end

+    can :index, Organization
    can :index, Ticket
    can :manage, TicketPurchase, user_id: user.id
    can [:new, :create], Payment, user_id: user.id