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

Rename 'notes/notes' partial to 'notes/notes_with_form'

Browse source
This commit is contained in:
Riyad Preukschas 2012-09-14 04:59:55 +02:00
parent cee230a158
commit 61eb650db0
8 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
app/views/merge_requests/show.js.haml
View file

@ -1,2 +1,2 @@
:plain
$(".merge-request-notes").html("#{escape_javascript(render("notes/notes", tid: @merge_request.id, tt: "merge_request"))}");
$(".merge-request-notes").html("#{escape_javascript(render notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")}");