diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/models/users | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/models/users')
-rw-r--r-- | app/models/users/banned_user.rb | 12 | ||||
-rw-r--r-- | app/models/users/in_product_marketing_email.rb | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app/models/users/banned_user.rb b/app/models/users/banned_user.rb new file mode 100644 index 00000000000..c52b6d4b728 --- /dev/null +++ b/app/models/users/banned_user.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +module Users + class BannedUser < ApplicationRecord + self.primary_key = :user_id + + belongs_to :user + + validates :user, presence: true + validates :user_id, uniqueness: { message: _("banned user already exists") } + end +end diff --git a/app/models/users/in_product_marketing_email.rb b/app/models/users/in_product_marketing_email.rb index 3e5e7b259d8..8fe52ac7ecc 100644 --- a/app/models/users/in_product_marketing_email.rb +++ b/app/models/users/in_product_marketing_email.rb @@ -19,7 +19,10 @@ module Users verify: 1, trial: 2, team: 3, - experience: 4 + experience: 4, + team_short: 5, + trial_short: 6, + admin_verify: 7 }, _suffix: true scope :without_track_and_series, -> (track, series) do |