Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 9eb3308b901..83c85f30178 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -10,7 +10,8 @@ class Discussion
   # Bump this if we need to refresh the cached versions of discussions
   CACHE_VERSION = 1
 
-  attr_reader :notes, :context_noteable
+  attr_reader :context_noteable
+  attr_accessor :notes
 
   delegate  :created_at,
             :project,
@@ -183,4 +184,11 @@ class Discussion
       resolved_at
     ].join(':')
   end
+
+  # Consolidate discussions GID. There is no need to have different GID for different class names as the discussion_id
+  # hash is already unique per discussion. This also fixes the issue where same discussion may return different GIDs
+  # depending on number of notes it has.
+  def to_global_id(options = {})
+    GlobalID.new(::Gitlab::GlobalId.build(model_name: Discussion.to_s, id: id))
+  end
 end