diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-15 23:46:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 23:46:33 +0100 |
| commit | ba22398c38067e05f141a0dddeb20bf68913988a (patch) | |
| tree | d16cecb0e7c74dc8498074ce5e0670a4b3c67b2f /app/models/concerns/expireable.rb | |
| parent | 995ad2af30d4838d07d68f0e89f1868307d1e478 (diff) | |
| parent | eac4a3e9c82b0ff8ade2e8b86282387df6039868 (diff) | |
Merge pull request #1512 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/expireable.rb')
| -rw-r--r-- | app/models/concerns/expireable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb index a66a4661b..4d902abcb 100644 --- a/app/models/concerns/expireable.rb +++ b/app/models/concerns/expireable.rb @@ -17,7 +17,7 @@ module Expireable end def expires_in=(interval) - self.expires_at = interval.to_i.seconds.from_now if interval.present? + self.expires_at = interval.present? ? interval.to_i.seconds.from_now : nil @expires_in = interval end |