Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 3c40f4beedc..d4f8c1b3b0b 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -242,7 +242,7 @@ class Snippet < ApplicationRecord
   end
 
   def hook_attrs
-    attributes
+    attributes.merge('url' => Gitlab::UrlBuilder.build(self))
   end
 
   def file_name
@@ -261,13 +261,12 @@ class Snippet < ApplicationRecord
     notes.includes(:author)
   end
 
-  def check_for_spam?(user:)
-    visibility_level_changed?(to: Snippet::PUBLIC) ||
-      (public? && (title_changed? || description_changed?))
+  def check_for_spam?(*)
+    visibility_level_changed?(to: Snippet::PUBLIC) || (public? && spammable_attribute_changed?)
   end
 
-  def spammable_entity_type
-    'snippet'
+  def supports_recaptcha?
+    true
   end
 
   def to_ability_name