tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
This commit is contained in:
Thibaut Girka
2018-08-27 17:30:42 +02:00
parent af934b9071 81697997a3
commit 53b7bb9d04
83 changed files with 900 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/expireable.rb
View File

@@ -9,7 +9,7 @@ module Expireable
attr_reader :expires_in
def expires_in=(interval)
self.expires_at = interval.to_i.seconds.from_now unless interval.blank?
self.expires_at = interval.to_i.seconds.from_now if interval.present?
@expires_in = interval
end