diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/models/users | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/models/users')
-rw-r--r-- | app/models/users/credit_card_validation.rb | 11 | ||||
-rw-r--r-- | app/models/users/merge_request_interaction.rb | 2 |
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') |