Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 3 insertions, 1 deletions

diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index f3a9293376f..4165d3b753f 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -76,12 +76,14 @@ class SentNotification < ApplicationRecord
 
   def position=(new_position)
     if new_position.is_a?(String)
-      new_position = JSON.parse(new_position) rescue nil
+      new_position = Gitlab::Json.parse(new_position) rescue nil
     end
 
     if new_position.is_a?(Hash)
       new_position = new_position.with_indifferent_access
       new_position = Gitlab::Diff::Position.new(new_position)
+    else
+      new_position = nil
     end
 
     super(new_position)