kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert note.project references back to @project

Browse source 
-removed extranious space from new_merge_request_email.text.erb

Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
This commit is contained in:
Izaak Alpert 2013-07-17 16:42:49 -04:00
parent 5806402740
commit 532809a173
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/notes_helper.rb
View file

@ -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

2
app/views/notify/new_merge_request_email.text.erb
View file

@ -2,7 +2,7 @@ New Merge Request <%= @merge_request.id %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
<%= merge_path_description(@merge_request, 'to') %> <%= merge_path_description(@merge_request, 'to') %>
Author: <%= @merge_request.author_name %> Author: <%= @merge_request.author_name %>
Asignee: <%= @merge_request.assignee_name %> Asignee: <%= @merge_request.assignee_name %>

2
app/views/projects/notes/_discussion.html.haml
View file

@ -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