Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbarthc <mackintosh02@gmail.com>2016-08-30 22:57:47 +0300
committerbarthc <mackintosh02@gmail.com>2016-08-30 22:57:47 +0300
commit29f818e6165e2e6d4a523270d115a491e261478a (patch)
tree63d2435aa585ea7ad0574cbe5f92dfc2714dcfb6 /app/models/concerns/awardable.rb
parent76872372376e57cd7d55ba9b9c63b25fe53c82df (diff)
prevent authored awardable thumbs votes
Diffstat (limited to 'app/models/concerns/awardable.rb')
-rw-r--r--app/models/concerns/awardable.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index e25420c0edf..83f5bc1fa9e 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -64,8 +64,11 @@ module Awardable
end
def user_can_award?(current_user, name)
- name = normalize_name(name)
- !(self.user_authored?(current_user) && awardable_votes?(name))
+ if user_authored?(current_user)
+ !awardable_votes?(normalize_name(name))
+ else
+ true
+ end
end
def awarded_emoji?(emoji_name, current_user)