Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/description_version.rb b/app/models/description_version.rb
index 05362a2f90b..f69564f4893 100644
--- a/app/models/description_version.rb
+++ b/app/models/description_version.rb
@@ -19,7 +19,13 @@ class DescriptionVersion < ApplicationRecord
   def exactly_one_issuable
     issuable_count = self.class.issuable_attrs.count { |attr| self["#{attr}_id"] }
 
-    errors.add(:base, "Exactly one of #{self.class.issuable_attrs.join(', ')} is required") if issuable_count != 1
+    if issuable_count != 1
+      errors.add(
+        :base,
+        _("Exactly one of %{attributes} is required") %
+          { attributes: self.class.issuable_attrs.join(', ') }
+      )
+    end
   end
 end