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:
authorHeinrich Lee Yu <hleeyu@gmail.com>2018-10-27 18:52:26 +0300
committerHeinrich Lee Yu <hleeyu@gmail.com>2018-11-01 02:45:36 +0300
commit8df7e6021b0da30e3b7550ca83cd9ab3f991c235 (patch)
tree3405c6855ff3b1b78d488be8d041ea2b1ab19005 /app/models/concerns/awardable.rb
parent69dcab2311e84b1a12cefab2cd92ef37ff97e38f (diff)
Fix tests
Diffstat (limited to 'app/models/concerns/awardable.rb')
-rw-r--r--app/models/concerns/awardable.rb18
1 files changed, 2 insertions, 16 deletions
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index 25b14eb110c..60b7ec2815c 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -13,13 +13,13 @@ module Awardable
end
class_methods do
- def awarded(user, name)
+ def awarded(user, name = nil)
sql = <<~EOL
EXISTS (
SELECT TRUE
FROM award_emoji
WHERE user_id = :user_id AND
- name = :name AND
+ #{"name = :name AND" if name.present?}
awardable_type = :awardable_type AND
awardable_id = #{self.arel_table.name}.id
)
@@ -28,20 +28,6 @@ module Awardable
where(sql, user_id: user.id, name: name, awardable_type: self.name)
end
- def awarded_any(user)
- sql = <<~EOL
- EXISTS (
- SELECT TRUE
- FROM award_emoji
- WHERE user_id = :user_id AND
- awardable_type = :awardable_type AND
- awardable_id = #{self.arel_table.name}.id
- )
- EOL
-
- where(sql, user_id: user.id, awardable_type: self.name)
- end
-
def not_awarded(user)
sql = <<~EOL
NOT EXISTS (