diff options
Diffstat (limited to 'app/models/users')
| -rw-r--r-- | app/models/users/callout.rb | 3 | ||||
| -rw-r--r-- | app/models/users/ghost_user_migration.rb | 2 | ||||
| -rw-r--r-- | app/models/users/namespace_commit_email.rb | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/app/models/users/callout.rb b/app/models/users/callout.rb index ae6950d800c..b037d07658d 100644 --- a/app/models/users/callout.rb +++ b/app/models/users/callout.rb @@ -62,7 +62,8 @@ module Users namespace_storage_limit_banner_error_threshold: 58, # EE-only project_quality_summary_feedback: 59, # EE-only merge_request_settings_moved_callout: 60, - new_top_level_group_alert: 61 + new_top_level_group_alert: 61, + artifacts_management_page_feedback_banner: 62 } validates :feature_name, diff --git a/app/models/users/ghost_user_migration.rb b/app/models/users/ghost_user_migration.rb index 1d93498e88b..4578e0503c3 100644 --- a/app/models/users/ghost_user_migration.rb +++ b/app/models/users/ghost_user_migration.rb @@ -8,5 +8,7 @@ module Users belongs_to :initiator_user, class_name: 'User' validates :user_id, presence: true + + scope :consume_order, -> { order(:consume_after, :id) } end end diff --git a/app/models/users/namespace_commit_email.rb b/app/models/users/namespace_commit_email.rb new file mode 100644 index 00000000000..4ec02f12717 --- /dev/null +++ b/app/models/users/namespace_commit_email.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +module Users + class NamespaceCommitEmail < ApplicationRecord + belongs_to :user + belongs_to :namespace + belongs_to :email + + validates :user, presence: true + validates :namespace, presence: true + validates :email, presence: true + validates :user_id, uniqueness: { scope: [:namespace_id] } + end +end |