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

This commit is contained in:
Thibaut Girka committed 2018-08-19 09:27:18 +02:00
commit 88a0395a58
22 files changed
+108 -28

No files matched your search

@@ -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