Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 0 deletions

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
new file mode 100644
index 00000000000..643b4060ad6
--- /dev/null
+++ b/app/models/custom_emoji.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CustomEmoji < ApplicationRecord
+  belongs_to :namespace, inverse_of: :custom_emoji
+
+  validate :valid_emoji_name
+
+  validates :namespace, presence: true
+  validates :name,
+    uniqueness: { scope: [:namespace_id, :name] },
+    presence: true,
+    length: { maximum: 36 },
+    format: { with: /\A\w+\z/ }
+
+  private
+
+  def valid_emoji_name
+    if Gitlab::Emoji.emoji_exists?(name)
+      errors.add(:name, _('%{name} is already being used for another emoji') % { name: self.name })
+    end
+  end
+end