66 lines
2.3 KiB
Plaintext
66 lines
2.3 KiB
Plaintext
%h3
|
|
= "Merge Request ##{@merge_request.id}:"
|
|
|
|
%span.label= @merge_request.source_branch
|
|
→
|
|
%span.label= @merge_request.target_branch
|
|
|
|
%span.right
|
|
- if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
|
|
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small" do
|
|
Edit Merge Request
|
|
%hr
|
|
|
|
%div
|
|
%span.entity-info
|
|
= image_tag gravatar_icon(@merge_request.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
|
%span.commit-title
|
|
%strong
|
|
%span.commit-author
|
|
%strong
|
|
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.author.id)) do
|
|
%span.author= @merge_request.author_name
|
|
→
|
|
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.assignee.id)) do
|
|
%span.author= @merge_request.assignee_name
|
|
%br
|
|
= @merge_request.created_at.stamp("Aug 21, 2011 9:23pm")
|
|
%hr
|
|
.clearfix
|
|
%div.well= simple_format @merge_request.title
|
|
|
|
|
|
.tabs
|
|
%li.active
|
|
= link_to "#notes", :class => "merge-notes-tab tab" do
|
|
Notes
|
|
%li
|
|
= link_to "#commits", "data-url" => commits_project_merge_request_path(@project, @merge_request), :class => "merge-commits-tab tab" do
|
|
Commits
|
|
%li
|
|
= link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
|
|
Diff
|
|
|
|
- if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
|
|
.right
|
|
- if @merge_request.closed
|
|
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
|
|
- else
|
|
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
|
|
%img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
|
|
|
|
.merge-request-notes
|
|
.issue_notes= render "notes/notes"
|
|
.loading{ :style => "display:none;"}
|
|
%center= image_tag "ajax-loader.gif"
|
|
.clear
|
|
|
|
.merge-request-commits
|
|
.merge-request-diffs
|
|
|
|
|
|
:javascript
|
|
$(function(){
|
|
MergeRequest.init();
|
|
})
|