Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/diff_discussion.rb')
-rw-r--r--app/models/diff_discussion.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb
index f4d665cf279..041ec98ffc9 100644
--- a/app/models/diff_discussion.rb
+++ b/app/models/diff_discussion.rb
@@ -37,18 +37,18 @@ class DiffDiscussion < Discussion
def reply_attributes
super.merge(
- original_position: original_position.to_json,
- position: position.to_json
+ original_position: Gitlab::Json.dump(original_position),
+ position: Gitlab::Json.dump(position)
)
end
def cache_key
- positions_json = diff_note_positions.map { |dnp| dnp.position.to_json }
+ positions_json = diff_note_positions.map { |dnp| Gitlab::Json.dump(dnp.position) }
positions_sha = Digest::SHA1.hexdigest(positions_json.join(':')) if positions_json.any?
[
super,
- Digest::SHA1.hexdigest(position.to_json),
+ Digest::SHA1.hexdigest(Gitlab::Json.dump(position)),
positions_sha
].join(':')
end