ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix audit log error when custom emoji is copied from remote server (#11876)

rebase/4.0.0rc2
han@highemelry 2019-09-18 06:20:48 +09:00 committed by Eugen Rochko
parent 75c6ad500d
commit 3919571c39
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/custom_emoji.rb
View File

@ -63,7 +63,7 @@ class CustomEmoji < ApplicationRecord
def copy! def copy!
copy = self.class.find_or_initialize_by(domain: nil, shortcode: shortcode) copy = self.class.find_or_initialize_by(domain: nil, shortcode: shortcode)
copy.image = image copy.image = image
copy.save! copy.tap(&:save!)
end end
class << self class << self