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

switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-17 22:35:45 +02:00
parent 843ea5bf22
commit 2e9c0e2b47
5 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/notes/_discussion.html.haml
View file

@ -10,7 +10,7 @@
Show discussion
= image_tag gravatar_icon(note.author.email), class: "avatar s32"
%div
= link_to note.author_name, project_team_member_path(@project, @project.team_member_by_id(note.author)), class: "note-author"
= link_to_member(@project, note.author, avatar: false)
- if note.for_merge_request?
- if note.diff
started a discussion on this merge request diff
@ -30,7 +30,7 @@
%div
- last_note = discussion_notes.last
last updated by
= link_to last_note.author_name, project_team_member_path(@project, @project.team_member_by_id(last_note.author)), class: "note-author"
= link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update
= time_ago_in_words(last_note.updated_at)
ago

2
app/views/notes/_note.html.haml
View file

@ -9,7 +9,7 @@
= link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do
%i.icon-trash.cred
= image_tag gravatar_icon(note.author.email), class: "avatar s32"
= link_to note.author_name, project_team_member_path(@project, @project.team_member_by_id(note.author)), class: "note-author"
= link_to_member(@project, note.author, avatar: false)
%span.note-last-update
= time_ago_in_words(note.updated_at)
ago