Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 4 deletions

diff --git a/app/validators/gitlab/emoji_name_validator.rb b/app/validators/gitlab/emoji_name_validator.rb
index c14d6e4ec78..c034a79214b 100644
--- a/app/validators/gitlab/emoji_name_validator.rb
+++ b/app/validators/gitlab/emoji_name_validator.rb
@@ -24,11 +24,9 @@ module Gitlab
     end
 
     def valid_custom_emoji?(record, value)
-      namespace = record.try(:awardable).try(:namespace)
+      resource = record.try(:resource_parent)
 
-      return unless namespace
-
-      namespace.custom_emoji&.by_name(value.to_s)&.any?
+      CustomEmoji.for_resource(resource).by_name(value.to_s).any?
     end
   end
 end