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

2019-07-28 16:28:05 +02:00
parent 91da921dbb cfb2ed7823
commit bca3825c17
48 changed files with 607 additions and 194 deletions
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -44,7 +44,7 @@ class InvitesController < ApplicationController
  end

  def invites
-    Invite.where(user: current_user).order(id: :desc)
+    current_user.invites.order(id: :desc)
  end

  def resource_params