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

fixed issue, mr crash if assignee/author removed from team

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-05 12:58:02 +02:00
parent 5a12bee37d
commit c90f1d5c8b
6 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,7 @@
%li.wll
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
%span.update-author
%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
%strong= link_to_merge_request_author(merge_request)
authored
= time_ago_in_words(merge_request.created_at)
ago

6
app/views/merge_requests/show.html.haml
View file

@ -30,13 +30,11 @@
%div
%cite.cgray Created by
= image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.author.id)) do
%strong.author= @merge_request.author_name
%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"
= link_to project_team_member_path(@project, @project.team_member_by_id(@merge_request.assignee.id)) do
%strong.author= @merge_request.assignee_name
%strong.author= link_to_merge_request_assignee(@merge_request)
%hr