diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 15:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-11 15:07:56 +0300 |
| commit | e105f6b881d9341331558c8c42f90391bab2fd19 (patch) | |
| tree | 8b3dcfcd9b57f94bd1d8488c7728e6894a897829 /app/models/users | |
| parent | 27ad9b4c89456548d3eaa380a8ab7cc7380f34c3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/users')
| -rw-r--r-- | app/models/users/callout.rb | 6 | ||||
| -rw-r--r-- | app/models/users/group_callout.rb | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/models/users/callout.rb b/app/models/users/callout.rb index 5c39e29a128..800256a613b 100644 --- a/app/models/users/callout.rb +++ b/app/models/users/callout.rb @@ -42,7 +42,11 @@ module Users security_newsletter_callout: 39, verification_reminder: 40, # EE-only ci_deprecation_warning_for_types_keyword: 41, - security_training_feature_promotion: 42 # EE-only + security_training_feature_promotion: 42, # EE-only + storage_enforcement_banner_first_enforcement_threshold: 43, + storage_enforcement_banner_second_enforcement_threshold: 44, + storage_enforcement_banner_third_enforcement_threshold: 45, + storage_enforcement_banner_fourth_enforcement_threshold: 46 } validates :feature_name, diff --git a/app/models/users/group_callout.rb b/app/models/users/group_callout.rb index 0dc449719ab..839be8d2a48 100644 --- a/app/models/users/group_callout.rb +++ b/app/models/users/group_callout.rb @@ -11,10 +11,10 @@ module Users enum feature_name: { invite_members_banner: 1, approaching_seat_count_threshold: 2, # EE-only - storage_enforcement_banner_first_enforcement_threshold: 43, - storage_enforcement_banner_second_enforcement_threshold: 44, - storage_enforcement_banner_third_enforcement_threshold: 45, - storage_enforcement_banner_fourth_enforcement_threshold: 46 + storage_enforcement_banner_first_enforcement_threshold: 3, + storage_enforcement_banner_second_enforcement_threshold: 4, + storage_enforcement_banner_third_enforcement_threshold: 5, + storage_enforcement_banner_fourth_enforcement_threshold: 6 } validates :group, presence: true |