Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index c90023dd9df..424778af4e6 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -13,7 +13,13 @@ class AbuseReport < ApplicationRecord
   validates :user, presence: true
   validates :message, presence: true
   validates :category, presence: true
-  validates :user_id, uniqueness: { message: 'has already been reported' }
+  validates :user_id,
+    uniqueness: {
+      scope: :reporter_id,
+      message: ->(object, data) do
+        _('You have already reported this user')
+      end
+    }
 
   scope :by_user, ->(user) { where(user_id: user) }
   scope :with_users, -> { includes(:reporter, :user) }