diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
| commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
| tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /app/models/users | |
| parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) | |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'app/models/users')
| -rw-r--r-- | app/models/users/callout.rb | 9 | ||||
| -rw-r--r-- | app/models/users/calloutable.rb | 4 | ||||
| -rw-r--r-- | app/models/users/group_callout.rb | 7 |
3 files changed, 18 insertions, 2 deletions
diff --git a/app/models/users/callout.rb b/app/models/users/callout.rb index 896cccfa0e5..38e518b6d3e 100644 --- a/app/models/users/callout.rb +++ b/app/models/users/callout.rb @@ -65,7 +65,14 @@ module Users artifacts_management_page_feedback_banner: 62, # 63 and 64 were removed with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120233 branch_rules_info_callout: 65, - create_runner_workflow_banner: 66 + create_runner_workflow_banner: 66, + repository_storage_limit_banner_info_threshold: 67, # EE-only + repository_storage_limit_banner_warning_threshold: 68, # EE-only + repository_storage_limit_banner_alert_threshold: 69, # EE-only + repository_storage_limit_banner_error_threshold: 70, # EE-only + new_navigation_callout: 71, + code_suggestions_third_party_callout: 72, # EE-only + namespace_over_storage_users_combined_alert: 73 # EE-only } validates :feature_name, diff --git a/app/models/users/calloutable.rb b/app/models/users/calloutable.rb index 280a819e4d5..483d0d785a5 100644 --- a/app/models/users/calloutable.rb +++ b/app/models/users/calloutable.rb @@ -13,5 +13,9 @@ module Users def dismissed_after?(dismissed_after) dismissed_at > dismissed_after end + + def dismissed_before?(dismissed_before) + dismissed_at < dismissed_before + end end end diff --git a/app/models/users/group_callout.rb b/app/models/users/group_callout.rb index 1cc9f1f50ad..c5946197b6f 100644 --- a/app/models/users/group_callout.rb +++ b/app/models/users/group_callout.rb @@ -25,7 +25,12 @@ module Users preview_usage_quota_free_plan_alert: 15, # EE-only enforcement_at_limit_alert: 16, # EE-only web_hook_disabled: 17, # EE-only - unlimited_members_during_trial_alert: 18 # EE-only + unlimited_members_during_trial_alert: 18, # EE-only + repository_storage_limit_banner_info_threshold: 19, # EE-only + repository_storage_limit_banner_warning_threshold: 20, # EE-only + repository_storage_limit_banner_alert_threshold: 21, # EE-only + repository_storage_limit_banner_error_threshold: 22, # EE-only + namespace_over_storage_users_combined_alert: 23 # EE-only } validates :group, presence: true |