award for merge requests[ci skip]

app/assets/stylesheets/pages/issuable.scss

@@ -114,8 +114,8 @@
     cursor: pointer;
 
     &.active {
-      border-color: rgba(79,176,252,.4);
-      background-color: rgba(79,176,252,.08);
+      border-color: rgba(79,176,252,0.4);
+      background-color: rgba(79,176,252,0.1);
 
       .counter {
         font-weight: bold;

app/controllers/projects/merge_requests_controller.rb

@@ -254,7 +254,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
-    @notes = @merge_request.nonawards.mr_and_commit_notes.inc_author.fresh
+    @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
     @discussions = Note.discussions_from_notes(@notes)
     @noteable = @merge_request
 

app/views/votes/_votes_block.html.haml

@@ -15,8 +15,8 @@
   
 :coffeescript
   post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}"
-  noteable_type = "Issue"
-  noteable_id = #{@issue.id}
+  noteable_type = #{votable}
+  noteable_id = #{votable.id}
   window.awards_handler = new AwardsHandler(post_emoji_url, noteable_type, noteable_id)
 
   $ ->
@@ -28,8 +28,4 @@
       emoji = $(this).find(".icon").data("emoji")
       awards_handler.addAward(emoji)
 
-    $(".award").tooltip()
-
-    
-
-      
\ No newline at end of file
+    $(".award").tooltip()
\ No newline at end of file