diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-19 10:42:55 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-19 10:42:55 +0100 |
commit | 7452a959989f1259b68d08814437bab53ee89bb0 (patch) | |
tree | 389c2be7b7a326729e4687019a58950a07bd2dde /app/models/concerns/expireable.rb | |
parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
parent | fef6c59b3abe349132dbe910b6aa243e59b732bb (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
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 4d902abcb..c64fc7d80 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.present? ? interval.to_i.seconds.from_now : nil + self.expires_at = interval.present? ? interval.to_i.seconds.from_now : nil @expires_in = interval end |