gitlabhq/app/views/merge_requests/_show.html.haml

39 lines
1.3 KiB
Plaintext
Raw Normal View History

= render "merge_requests/show/mr_title"
= render "merge_requests/show/how_to_merge"
= render "merge_requests/show/mr_box"
= render "merge_requests/show/mr_accept"
= render "merge_requests/show/commits"
- if @commits.present?
%ul.nav.nav-tabs.mr_nav_tabs
%li
= link_to "#notes", title: "Discussion", "data-url" => project_merge_request_path(@project, @merge_request), class: "merge-notes-tab tab" do
%i.icon-comments
Discussion
%li
= link_to "#diffs", title: "Diff", "data-url" => diffs_project_merge_request_path(@project, @merge_request), class: "merge-diffs-tab tab" do
%i.icon-list-alt
Diff
.merge_request_notes.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
2012-12-02 20:43:39 +01:00
= render "notes/notes_with_form"
.merge-request-diffs
= render "merge_requests/show/diffs" if @diffs
.status
:javascript
$(function(){
MergeRequest.init({
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
current_state: "#{@merge_request.human_state}",
action: "#{controller.action_name}"
});
$(".edit_merge_request").live("ajax:beforeSend", function() {
2012-08-18 23:45:46 +02:00
$('.can_be_merged').hide();
$('.merge_in_progress').show();
})
})