Award: merge request fix

2015-11-21 18:32:59 +02:00 · 2015-11-21 18:32:59 +02:00 · fbac9e106d
parent e2d5f9a83a
commit fbac9e106d
1 changed files with 5 additions and 2 deletions
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@ -59,8 +59,11 @@ class Projects::NotesController < Projects::ApplicationController
  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,