Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 2 insertions, 10 deletions

diff --git a/app/models/user_interacted_project.rb b/app/models/user_interacted_project.rb
index 4c8cc5fc83a..1c7515894fe 100644
--- a/app/models/user_interacted_project.rb
+++ b/app/models/user_interacted_project.rb
@@ -24,16 +24,8 @@ class UserInteractedProject < ApplicationRecord
       }
 
       cached_exists?(**attributes) do
-        transaction(requires_new: true) do
-          where(attributes).select(1).first || create!(attributes)
-          true # not caching the whole record here for now
-        rescue ActiveRecord::RecordNotUnique
-          # Note, above queries are not atomic and prone
-          # to race conditions (similar like #find_or_create!).
-          # In the case where we hit this, the record we want
-          # already exists - shortcut and return.
-          true
-        end
+        where(attributes).exists? || UserInteractedProject.insert_all([attributes], unique_by: %w(project_id user_id))
+        true
       end
     end