summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorChantal Rollison <crollison@gitlab.com>2018-08-24 10:13:41 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-24 10:13:41 +0000
commit009c4f7fb892e8af09cc2489f015ea6c62411df6 (patch)
tree5cce8b07846ed39aa8bd00bd149a7999d0d7b85a /app/models/concerns
parentf4d18201d2fd46f75612485f97dde157e8aca71e (diff)
downloadgitlab-ce-009c4f7fb892e8af09cc2489f015ea6c62411df6.tar.gz
Allows author to vote on their own issue
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/awardable.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index 49981db0d80..4200253053a 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -76,12 +76,8 @@ module Awardable
true
end
- def awardable_votes?(name)
- AwardEmoji::UPVOTE_NAME == name || AwardEmoji::DOWNVOTE_NAME == name
- end
-
- def user_can_award?(current_user, name)
- awardable_by_user?(current_user, name) && Ability.allowed?(current_user, :award_emoji, self)
+ def user_can_award?(current_user)
+ Ability.allowed?(current_user, :award_emoji, self)
end
def user_authored?(current_user)
@@ -117,12 +113,4 @@ module Awardable
def normalize_name(name)
Gitlab::Emoji.normalize_emoji_name(name)
end
-
- def awardable_by_user?(current_user, name)
- if user_authored?(current_user)
- !awardable_votes?(normalize_name(name))
- else
- true
- end
- end
end