Revert note.project references back to @project
-removed extranious space from new_merge_request_email.text.erb Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
This commit is contained in:
parent
5806402740
commit
532809a173
|
@ -11,7 +11,7 @@ module NotesHelper
|
||||||
|
|
||||||
def link_to_commit_diff_line_note(note)
|
def link_to_commit_diff_line_note(note)
|
||||||
if note.for_commit_diff_line?
|
if note.for_commit_diff_line?
|
||||||
link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(note.project, note.noteable, anchor: note.line_code)
|
link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(@project, note.noteable, anchor: note.line_code)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
Show discussion
|
Show discussion
|
||||||
= image_tag gravatar_icon(note.author_email), class: "avatar s32"
|
= image_tag gravatar_icon(note.author_email), class: "avatar s32"
|
||||||
%div
|
%div
|
||||||
= link_to_member(note.project, note.author, avatar: false)
|
= link_to_member(@project, note.author, avatar: false)
|
||||||
- if note.for_merge_request?
|
- if note.for_merge_request?
|
||||||
- if note.diff
|
- if note.diff
|
||||||
started a discussion on this merge request diff
|
started a discussion on this merge request diff
|
||||||
|
|
Loading…
Reference in New Issue