60 lines
2.2 KiB
Plaintext
60 lines
2.2 KiB
Plaintext
.merge-request-show-holder.ui-box.width-100p
|
|
%h3
|
|
= "Merge Request ##{@merge_request.id}:"
|
|
|
|
= "'#{@merge_request.source_branch}'"
|
|
→
|
|
= "'#{@merge_request.target_branch}'"
|
|
.right
|
|
- if @merge_request.closed
|
|
%span.tag.high Resolved
|
|
- 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
|
|
= link_to 'Resolve', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button"
|
|
.right
|
|
= link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), :class => "grey-button positive"
|
|
|
|
.clear
|
|
%br
|
|
%br
|
|
|
|
|
|
- if @commits.size > 0
|
|
.merge-request-commits.ui-box.width-100p
|
|
- @commits.each do |commit|
|
|
%a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
|
|
- if commit.author_email
|
|
= image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
|
- else
|
|
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
|
|
%span.update-title
|
|
= commit.id.to_s
|
|
%span.update-author
|
|
%strong= commit.author_name
|
|
authored
|
|
= time_ago_in_words(commit.created_at)
|
|
ago
|
|
.clear
|