summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/toggle_award_emoji.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-06-03 11:44:04 +0200
committerFatih Acet <acetfatih@gmail.com>2016-09-19 19:47:43 +0300
commit25004cbc32432d989a05532925c5c4c591cca1b5 (patch)
tree24b83bb5993f196c7fcfd0e0c30d14b4cc26dd31 /app/controllers/concerns/toggle_award_emoji.rb
parentb94de5fd555213ae28030c33c27440228f8efb65 (diff)
downloadgitlab-ce-25004cbc32432d989a05532925c5c4c591cca1b5.tar.gz
Snippets get award emoji! :thumbsup:
Diffstat (limited to 'app/controllers/concerns/toggle_award_emoji.rb')
-rw-r--r--app/controllers/concerns/toggle_award_emoji.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/concerns/toggle_award_emoji.rb b/app/controllers/concerns/toggle_award_emoji.rb
index 172d5344b7a..13086da7d5e 100644
--- a/app/controllers/concerns/toggle_award_emoji.rb
+++ b/app/controllers/concerns/toggle_award_emoji.rb
@@ -10,7 +10,9 @@ module ToggleAwardEmoji
if awardable.user_can_award?(current_user, name)
awardable.toggle_award_emoji(name, current_user)
- TodoService.new.new_award_emoji(to_todoable(awardable), current_user)
+
+ todoable = to_todoable(awardable)
+ TodoService.new.new_award_emoji(todoable, current_user) if todoable
render json: { ok: true }
else
@@ -24,8 +26,10 @@ module ToggleAwardEmoji
case awardable
when Note
awardable.noteable
- else
+ when MergeRequest, Issue
awardable
+ when Snippet
+ nil
end
end