1 files changed, 6 insertions, 2 deletions
diff --git a/app/roles/note_event.rb b/app/roles/note_event.rb
index 884ab432ec8..db4ced0c095 100644
--- a/app/roles/note_event.rb
+++ b/app/roles/note_event.rb
@@ -1,6 +1,6 @@
 module NoteEvent
   def note_commit_id
-    target.noteable_id
+    target.commit_id
   end
 
   def note_short_commit_id
@@ -16,7 +16,11 @@ module NoteEvent
   end
 
   def note_target_id
-    target.noteable_id
+    if note_commit?
+      target.commit_id
+    else
+      target.noteable_id.to_s
+    end
   end
 
   def wall_note?