Award: merge request fix

fbac9e10 · Valery Sizov · e2d5f9a8 · fbac9e10
Commit fbac9e10 authored Nov 21, 2015 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

app/controllers/projects/notes_controller.rb app/controllers/projects/notes_controller.rb +5 -2

No files found.
--- 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 = if note_params[:noteable_type] == "issue"
-    noteable = noteable.find_by!(id: note_params[:noteable_id], project: project)
+                 project.issues.find(note_params[:noteable_id])
+               else
+                 project.merge_requests.find(note_params[:noteable_id])
+               end
    data = {
      author: current_user,