diff options
author | ThibG <thib@sitedethib.com> | 2019-09-19 00:22:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-19 00:22:39 +0200 |
commit | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (patch) | |
tree | 1a99988dd7a46824527e59ee1861aa72ad7412ce /app/models/custom_emoji.rb | |
parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
parent | 2ecc7106d7fc222ca84777fc279e9f46f80afd5a (diff) |
Merge pull request #1221 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
-rw-r--r-- | app/models/custom_emoji.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index edb1bec75..0dacaf654 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -63,7 +63,7 @@ class CustomEmoji < ApplicationRecord def copy! copy = self.class.find_or_initialize_by(domain: nil, shortcode: shortcode) copy.image = image - copy.save! + copy.tap(&:save!) end class << self |