Merge pull request #544 from ThibG/glitch-soc/merge-upstream

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

1 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 70818610c..1053e9c42 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -12,7 +12,7 @@ class InvitesController < ApplicationController
     authorize :invite, :create?
 
     @invites = invites
-    @invite  = Invite.new(expires_in: 1.day.to_i)
+    @invite  = Invite.new
   end
 
   def create
@@ -47,6 +47,6 @@ class InvitesController < ApplicationController
   end
 
   def resource_params
-    params.require(:invite).permit(:max_uses, :expires_in)
+    params.require(:invite).permit(:max_uses, :expires_in, :autofollow)
   end
 end