deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bootstrap: Issues & MR

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-29 12:04:09 +02:00
parent d81f0b7845
commit a77c8bf9c3
11 changed files with 168 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/views/merge_requests/_merge_request.html.haml
View file

@ -1,14 +1,17 @@
%a.update-item{:href => project_merge_request_path(merge_request.project, merge_request)}
= image_tag gravatar_icon(merge_request.author_email), :class => "left", :width => 40
%span.update-title
= truncate(merge_request.title, :length => 60)
%li.wll
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
%span.update-author
%strong= merge_request.author_name
%strong
= link_to project_team_member_path(@project, @project.team_member_by_id(merge_request.author_id)), :class => "author_link" do
= merge_request.author_name
authored
= time_ago_in_words(merge_request.created_at)
ago
.right
%span.tag.commit= merge_request.source_branch
%span.label= merge_request.source_branch
→
%span.tag.commit= merge_request.target_branch
%span.label= merge_request.target_branch
= link_to project_merge_request_path(merge_request.project, merge_request) do
%p
Merge Request ##{merge_request.id}:
= truncate(merge_request.title, :length => 50)