Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 1 deletions

diff --git a/app/services/discussions/capture_diff_note_position_service.rb b/app/services/discussions/capture_diff_note_position_service.rb
index 4e8fd90a2e7..87aa27e455f 100644
--- a/app/services/discussions/capture_diff_note_position_service.rb
+++ b/app/services/discussions/capture_diff_note_position_service.rb
@@ -19,13 +19,16 @@ module Discussions
       position = result[:position]
       return unless position
 
+      line_code = position.line_code(project.repository)
+      return unless line_code
+
       # Currently position data is copied across all notes of a discussion
       # It makes sense to store a position only for the first note instead
       # Within the newly introduced table we can start doing just that
       DiffNotePosition.create_or_update_for(discussion.notes.first,
         diff_type: :head,
         position: position,
-        line_code: position.line_code(project.repository))
+        line_code: line_code)
     end
 
     private