kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

award for merge requests[ci skip]

This commit is contained in:
Valery Sizov 2015-11-18 16:48:37 +02:00 committed by Valery Sizov
parent f021bc5c6a
commit 2f6f99d300
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/pages/issuable.scss
View File

@ -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;

2
app/controllers/projects/merge_requests_controller.rb
View File

@ -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

10
app/views/votes/_votes_block.html.haml
View File

@ -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()
$(".award").tooltip()