2011-11-28 08:39:43 +01:00
|
|
|
.merge-request-show-holder.ui-box.width-100p
|
|
|
|
%h3
|
|
|
|
= "Merge Request ##{@merge_request.id}:"
|
|
|
|
|
2011-11-28 19:30:35 +01:00
|
|
|
.tag.commit.inline= @merge_request.source_branch
|
2011-11-28 08:39:43 +01:00
|
|
|
→
|
2011-11-28 19:30:35 +01:00
|
|
|
.tag.commit.inline= @merge_request.target_branch
|
2011-11-28 08:39:43 +01:00
|
|
|
.right
|
|
|
|
- if @merge_request.closed
|
2011-11-28 19:30:35 +01:00
|
|
|
%span.tag.high Closed
|
2011-11-28 08:39:43 +01:00
|
|
|
- else
|
|
|
|
%span.tag.today Open
|
|
|
|
|
|
|
|
.data
|
|
|
|
%p= @merge_request.title
|
|
|
|
|
|
|
|
- if @merge_request.author == @merge_request.assignee
|
|
|
|
= image_tag gravatar_icon(@merge_request.assignee_email), :width => 20, :style => "padding:0 5px;"
|
|
|
|
= @merge_request.assignee_name
|
|
|
|
- else
|
|
|
|
= image_tag gravatar_icon(@merge_request.author_email), :width => 20, :style => "padding:0 5px;"
|
|
|
|
= @merge_request.author_name
|
|
|
|
→
|
|
|
|
= image_tag gravatar_icon(@merge_request.assignee_email), :width => 20, :style => "padding:0 5px;"
|
|
|
|
= @merge_request.assignee_name
|
|
|
|
.right
|
|
|
|
%cite.cgray= @merge_request.created_at.stamp("21 Aug 2011, 11:15pm")
|
|
|
|
.clear
|
|
|
|
|
|
|
|
.buttons
|
|
|
|
- if can? current_user, :write_project, @project
|
|
|
|
- if @merge_request.closed
|
|
|
|
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button"
|
|
|
|
- else
|
2011-11-28 19:30:35 +01:00
|
|
|
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button"
|
2011-11-28 08:39:43 +01:00
|
|
|
.right
|
|
|
|
= link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), :class => "grey-button positive"
|
|
|
|
|
|
|
|
.clear
|
|
|
|
%br
|
|
|
|
%br
|
|
|
|
|
2011-11-28 21:16:57 +01:00
|
|
|
#gitlab-tabs
|
|
|
|
%ul
|
|
|
|
%li= link_to "Notes", "#merge-notes"
|
|
|
|
%li= link_to "Commits", commits_project_merge_request_path(@project, @merge_request)
|
|
|
|
%li= link_to "Diff", diffs_project_merge_request_path(@project, @merge_request)
|
2011-11-28 08:39:43 +01:00
|
|
|
|
2011-11-28 21:16:57 +01:00
|
|
|
#merge-notes
|
|
|
|
.issue_notes= render "notes/notes"
|
|
|
|
.loading{ :style => "display:none;"}
|
|
|
|
%center= image_tag "ajax-loader.gif"
|
|
|
|
.clear
|
|
|
|
|
|
|
|
|
|
|
|
:javascript
|
|
|
|
$(function(){
|
|
|
|
$("#gitlab-tabs").tabs();
|
|
|
|
})
|