From 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Jun 2023 10:43:29 +0000 Subject: Add latest changes from gitlab-org/gitlab@16-1-stable-ee --- app/models/snippet.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'app/models/snippet.rb') 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 -- cgit v1.2.3