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

90 lines
3 KiB
Plaintext
Raw Normal View History

2012-01-28 15:47:55 +01:00
%h3
= "Merge Request ##{@merge_request.id}:"
 
%span.pretty_label.branch= @merge_request.source_branch
2012-01-28 15:47:55 +01:00
→
%span.pretty_label.branch= @merge_request.target_branch
2012-01-28 15:47:55 +01:00
%span.right
- if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open?
= link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
Edit
2012-01-28 15:47:55 +01:00
%br
- if @merge_request.upvotes > 0
.upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
= render "merge_requests/how_to_merge"
2012-02-18 13:12:48 +01:00
.back_link
= link_to project_merge_requests_path(@project) do
← To merge requests
2012-02-18 13:43:35 +01:00
.main_box
.top_box_content
2012-03-25 18:44:29 +02:00
%h5
- if @merge_request.closed
.alert-message.error.status_info Closed
2012-03-25 18:44:29 +02:00
- else
.alert-message.success.status_info Open
2012-03-25 18:44:29 +02:00
= @merge_request.title
2012-01-28 16:21:00 +01:00
.middle_box_content
%div
%cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
= image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_merge_request_author(@merge_request)
%cite.cgray and currently assigned to
= image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
%strong.author= link_to_merge_request_assignee(@merge_request)
2012-03-25 18:44:29 +02:00
- if @merge_request.closed
.bottom_box_content
- if @merge_request.merged?
%span
Merged by #{@merge_request.merge_event.author_name}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event
%span
Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
2011-11-28 08:39:43 +01:00
= render "merge_requests/commits"
2011-11-28 08:39:43 +01:00
- unless @commits.empty?
.tabs
%li.active
= link_to "#notes", :class => "merge-notes-tab tab" do
Notes
%li
= link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
Diff
2011-12-13 22:24:31 +01:00
2011-12-13 09:07:52 +01:00
.merge_request_notes#notes= render "notes/notes", :tid => @merge_request.id, :tt => "merge_request"
2011-12-13 09:07:52 +01:00
.merge-request-diffs
.status
2011-11-28 21:16:57 +01:00
:javascript
$(function(){
2011-12-13 09:07:52 +01:00
MergeRequest.init();
2011-11-28 21:16:57 +01:00
})
= render "notes/per_line_form"
:javascript
$(document).ready(function(){
$(".line_note_link, .line_note_reply_link").live("click", function(e) {
var form = $(".per_line_form");
$(this).parent().parent().after(form);
form.find("#note_line_code").val($(this).attr("line_code"));
form.show();
return false;
});
});