Commit 78be7055 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'award_fix' into 'master'

Award Emoji: fix for merge requests

Closes #3597

See merge request !1865
parents c502695f fbac9e10
......@@ -59,8 +59,11 @@ def delete_attachment
end
def award_toggle
noteable = note_params[:noteable_type] == "issue" ? Issue : MergeRequest
noteable = noteable.find_by!(id: note_params[:noteable_id], project: project)
noteable = if note_params[:noteable_type] == "issue"
project.issues.find(note_params[:noteable_id])
else
project.merge_requests.find(note_params[:noteable_id])
end
data = {
author: current_user,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment