diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/models/award_emoji.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/models/award_emoji.rb')
-rw-r--r-- | app/models/award_emoji.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb index 5ba6100f169..c8f6b9aaedb 100644 --- a/app/models/award_emoji.rb +++ b/app/models/award_emoji.rb @@ -24,8 +24,8 @@ class AwardEmoji < ApplicationRecord scope :named, -> (names) { where(name: names) } scope :awarded_by, -> (users) { where(user: users) } - after_save :expire_etag_cache - after_destroy :expire_etag_cache + after_save :expire_cache + after_destroy :expire_cache class << self def votes_for_collection(ids, type) @@ -60,7 +60,9 @@ class AwardEmoji < ApplicationRecord self.name == UPVOTE_NAME end - def expire_etag_cache + def expire_cache + awardable.try(:bump_updated_at) awardable.try(:expire_etag_cache) + awardable.try(:update_upvotes_count) if upvote? end end |