Commit 2f6f99d3 authored by Valery Sizov's avatar Valery Sizov Committed by Valery Sizov

award for merge requests[ci skip]

parent f021bc5c
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
cursor: pointer; cursor: pointer;
&.active { &.active {
border-color: rgba(79,176,252,.4); border-color: rgba(79,176,252,0.4);
background-color: rgba(79,176,252,.08); background-color: rgba(79,176,252,0.1);
.counter { .counter {
font-weight: bold; font-weight: bold;
......
...@@ -254,7 +254,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -254,7 +254,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
# Build a note object for comment form # Build a note object for comment form
@note = @project.notes.new(noteable: @merge_request) @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) @discussions = Note.discussions_from_notes(@notes)
@noteable = @merge_request @noteable = @merge_request
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
:coffeescript :coffeescript
post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}" post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}"
noteable_type = "Issue" noteable_type = #{votable}
noteable_id = #{@issue.id} noteable_id = #{votable.id}
window.awards_handler = new AwardsHandler(post_emoji_url, noteable_type, noteable_id) window.awards_handler = new AwardsHandler(post_emoji_url, noteable_type, noteable_id)
$ -> $ ->
...@@ -29,7 +29,3 @@ ...@@ -29,7 +29,3 @@
awards_handler.addAward(emoji) awards_handler.addAward(emoji)
$(".award").tooltip() $(".award").tooltip()
\ No newline at end of file
\ No newline at end of file
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