diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index c82a8d108b6..a3ec4cca59d 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -11,7 +11,7 @@ module NotesHelper
 
   def link_to_commit_diff_line_note(note)
     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
 
diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb
index 5448c1088fe..3f711840a51 100644
--- a/app/views/notify/new_merge_request_email.text.erb
+++ b/app/views/notify/new_merge_request_email.text.erb
@@ -2,7 +2,7 @@ New Merge Request <%= @merge_request.id %>
 
 <%= 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 %>
 Asignee:  <%= @merge_request.assignee_name %>
 
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index ae317a6c1df..8c79b5ad53e 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -10,7 +10,7 @@
         Show discussion
     = image_tag gravatar_icon(note.author_email), class: "avatar s32"
     %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.diff
           started a discussion on this merge request diff