Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 20 insertions, 0 deletions

diff --git a/app/models/achievements/achievement.rb b/app/models/achievements/achievement.rb
index 904961491b5..a436e32b35b 100644
--- a/app/models/achievements/achievement.rb
+++ b/app/models/achievements/achievement.rb
@@ -7,6 +7,9 @@ module Achievements
 
     belongs_to :namespace, inverse_of: :achievements, optional: false
 
+    has_many :user_achievements, inverse_of: :achievement
+    has_many :users, through: :user_achievements, inverse_of: :achievements
+
     strip_attributes! :name, :description
 
     validates :name,
diff --git a/app/models/achievements/user_achievement.rb b/app/models/achievements/user_achievement.rb
new file mode 100644
index 00000000000..885ec660cc9
--- /dev/null
+++ b/app/models/achievements/user_achievement.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Achievements
+  class UserAchievement < ApplicationRecord
+    belongs_to :achievement, inverse_of: :user_achievements, optional: false
+    belongs_to :user, inverse_of: :user_achievements, optional: false
+
+    belongs_to :awarded_by_user,
+                class_name: 'User',
+                inverse_of: :awarded_user_achievements,
+                optional: true
+    belongs_to :revoked_by_user,
+                class_name: 'User',
+                inverse_of: :revoked_user_achievements,
+                optional: true
+  end
+end