deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-09-18 08:56:54 +03:00
commit 2aafd7cf4e
6 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/issues/show.html.haml
View file

@ -61,4 +61,4 @@
= markdown @issue.description
.issue_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"
.issue_notes.voting_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"

2
app/views/merge_requests/_show.html.haml
View file

@ -15,7 +15,7 @@
%i.icon-list-alt
Diff
.merge_request_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
.merge_request_notes.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")
.merge-request-diffs
= render "merge_requests/show/diffs" if @diffs

2
app/views/notes/_note.html.haml
View file

@ -1,4 +1,4 @@
%li{id: dom_id(note), class: "note"}
%li{id: dom_id(note), class: "note #{note_vote_class(note)}"}
= image_tag gravatar_icon(note.author.email), class: "avatar s32"
%div.note-author
%strong= note.author_name