Commit 532809a17310a14c16df7adfecbdfa363a068f40
1 parent
58064027
Exists in
master
and in
4 other branches
Revert note.project references back to @project
-removed extranious space from new_merge_request_email.text.erb Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
app/helpers/notes_helper.rb
| @@ -11,7 +11,7 @@ module NotesHelper | @@ -11,7 +11,7 @@ module NotesHelper | ||
| 11 | 11 | ||
| 12 | def link_to_commit_diff_line_note(note) | 12 | def link_to_commit_diff_line_note(note) |
| 13 | if note.for_commit_diff_line? | 13 | if note.for_commit_diff_line? |
| 14 | - link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(note.project, note.noteable, anchor: note.line_code) | 14 | + link_to "#{note.diff_file_name}:L#{note.diff_new_line}", project_commit_path(@project, note.noteable, anchor: note.line_code) |
| 15 | end | 15 | end |
| 16 | end | 16 | end |
| 17 | 17 |
app/views/notify/new_merge_request_email.text.erb
| @@ -2,7 +2,7 @@ New Merge Request <%= @merge_request.id %> | @@ -2,7 +2,7 @@ New Merge Request <%= @merge_request.id %> | ||
| 2 | 2 | ||
| 3 | <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> | 3 | <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> |
| 4 | 4 | ||
| 5 | - <%= merge_path_description(@merge_request, 'to') %> | 5 | +<%= merge_path_description(@merge_request, 'to') %> |
| 6 | Author: <%= @merge_request.author_name %> | 6 | Author: <%= @merge_request.author_name %> |
| 7 | Asignee: <%= @merge_request.assignee_name %> | 7 | Asignee: <%= @merge_request.assignee_name %> |
| 8 | 8 |
app/views/projects/notes/_discussion.html.haml
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | Show discussion | 10 | Show discussion |
| 11 | = image_tag gravatar_icon(note.author_email), class: "avatar s32" | 11 | = image_tag gravatar_icon(note.author_email), class: "avatar s32" |
| 12 | %div | 12 | %div |
| 13 | - = link_to_member(note.project, note.author, avatar: false) | 13 | + = link_to_member(@project, note.author, avatar: false) |
| 14 | - if note.for_merge_request? | 14 | - if note.for_merge_request? |
| 15 | - if note.diff | 15 | - if note.diff |
| 16 | started a discussion on this merge request diff | 16 | started a discussion on this merge request diff |