Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 12 insertions, 1 deletions

diff --git a/app/models/users/credit_card_validation.rb b/app/models/users/credit_card_validation.rb
new file mode 100644
index 00000000000..5e255acd882
--- /dev/null
+++ b/app/models/users/credit_card_validation.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Users
+  class CreditCardValidation < ApplicationRecord
+    RELEASE_DAY = Date.new(2021, 5, 17)
+
+    self.table_name = 'user_credit_card_validations'
+
+    belongs_to :user
+  end
+end
diff --git a/app/models/users/merge_request_interaction.rb b/app/models/users/merge_request_interaction.rb
index 35d1d3206b5..4af9361fbf6 100644
--- a/app/models/users/merge_request_interaction.rb
+++ b/app/models/users/merge_request_interaction.rb
@@ -41,4 +41,4 @@ module Users
   end
 end
 
-::Users::MergeRequestInteraction.prepend_if_ee('EE::Users::MergeRequestInteraction')
+::Users::MergeRequestInteraction.prepend_mod_with('Users::MergeRequestInteraction')