Merge branch 'master' into glitch-soc/merge-upstream

2018-08-19 09:27:18 +02:00
parent 44e31c3e53 59c68c1a74
commit 88a0395a58
22 changed files with 108 additions and 28 deletions
--- a/app/controllers/admin/invites_controller.rb
+++ b/app/controllers/admin/invites_controller.rb
@ -30,6 +30,12 @@ module Admin
      redirect_to admin_invites_path
    end

+    def deactivate_all
+      authorize :invite, :deactivate_all?
+      Invite.available.in_batches.update_all(expires_at: Time.now.utc)
+      redirect_to admin_invites_path
+    end
+
    private

    def resource_params