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

Merge branch 'issue_dashboard' into improved_dashboard

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-08 15:05:01 +02:00
commit 8e0126e9ec
20 changed files with 247 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,11 @@
%a.update-item{:href => project_merge_request_path(@project, merge_request)}
%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
= merge_request.title
%span.update-author
- if not @project.present?
%strong= merge_request.project.name
= '-'
%strong= merge_request.author_name
authored
= time_ago_in_words(merge_request.created_at)