diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-14 18:55:21 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-14 18:55:21 +0000 |
commit | 89a221dcc977270b96c44742c03ee94a223a0c0b (patch) | |
tree | 3e793ccf2845acb17178c6425bd2a8f65874c9c7 | |
parent | f0eefbc372f3f04ef59106c318a11759a1d0dd69 (diff) | |
parent | 4f817379401e8b1f6dd0be339929470dfa62ba47 (diff) | |
download | gitlab-ce-89a221dcc977270b96c44742c03ee94a223a0c0b.tar.gz |
Merge branch '12173-renumber-user-callout-enum' into 'master'
Renumber a new UserCallout enum for EE compatibility
Closes gitlab-ee#12173
See merge request gitlab-org/gitlab-ce!29701
-rw-r--r-- | app/models/user_callout_enums.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/user_callout_enums.rb b/app/models/user_callout_enums.rb index 54b0d2ce831..7b68e5076c7 100644 --- a/app/models/user_callout_enums.rb +++ b/app/models/user_callout_enums.rb @@ -6,12 +6,15 @@ module UserCalloutEnums # # This method is separate from the `UserCallout` model so that it can be # extended by EE. + # + # If you are going to add new items to this hash, check that you're not going + # to conflict with EE-only values: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/app/models/ee/user_callout_enums.rb def self.feature_names { gke_cluster_integration: 1, gcp_signup_offer: 2, cluster_security_warning: 3, - suggest_popover_dismissed: 4 + suggest_popover_dismissed: 9 } end end |