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

72 lines
2.2 KiB
Plaintext
Raw Normal View History

2012-01-28 15:47:55 +01:00
%h3
= "Merge Request ##{@merge_request.id}:"
 
%span.label= @merge_request.source_branch
→
%span.label= @merge_request.target_branch
%small
created at
= @merge_request.created_at.stamp("Aug 21, 2011")
2012-01-28 15:47:55 +01:00
%span.right
2012-01-28 16:21:00 +01:00
- if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
- 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"
2012-01-28 15:47:55 +01:00
- 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
2012-01-28 16:21:00 +01:00
Edit
2012-01-28 15:47:55 +01:00
%hr
2012-01-28 16:21:00 +01:00
- if @merge_request.closed
.alert-message.error Closed
- else
.alert-message.success Open
%div.well
%div
%cite.cgray Created 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)
%hr
2012-01-28 16:21:00 +01:00
%div= simple_format @merge_request.title
2011-11-28 08:39:43 +01:00
2012-01-26 23:13:19 +01:00
.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
2011-12-13 22:24:31 +01:00
2011-12-13 09:07:52 +01:00
%img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
.merge-request-notes
.merge_request_notes= render "notes/notes"
2011-12-13 09:07:52 +01:00
.loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif"
.clear
.merge-request-commits
.merge-request-diffs
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
})