diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /app/controllers/invites_controller.rb | |
parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
Diffstat (limited to 'app/controllers/invites_controller.rb')
-rw-r--r-- | app/controllers/invites_controller.rb | 4 |
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 |