diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 18:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 18:08:04 +0300 |
| commit | c4c1fc5fe7c756fc6f8f79eb1624b1bbe4fe2d69 (patch) | |
| tree | 8c95e39fc4956cdd9178c46ea85cbeeeac3bc360 /app/models/concerns/awardable.rb | |
| parent | 927df95cc4453bdacbc59960df32008b02c4e28a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/awardable.rb')
| -rw-r--r-- | app/models/concerns/awardable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb index f1b2bebfb47..896f0916d8c 100644 --- a/app/models/concerns/awardable.rb +++ b/app/models/concerns/awardable.rb @@ -74,7 +74,7 @@ module Awardable # By default we always load award_emoji user association awards = award_emoji.group_by(&:name) - if with_thumbs + if with_thumbs && (!project || project.show_default_award_emojis?) awards[AwardEmoji::UPVOTE_NAME] ||= [] awards[AwardEmoji::DOWNVOTE_NAME] ||= [] end |