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

Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-01 22:43:04 +02:00
parent 00028702fc
commit 5263dd4297
13 changed files with 153 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/views/events/_event_new_merge_request.html.haml Normal file
View file

@ -0,0 +1,15 @@
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
requested merge
= link_to project_merge_request_path(event.project, event.merge_request) do
%strong= truncate event.merge_request_title
at
%strong= link_to event.project.name, event.project
%span.cgray
= time_ago_in_words(event.created_at)
ago.
%br
%span.label= event.merge_request.source_branch
→
%span.label= event.merge_request.target_branch