Adjust models/license.rb file wrong conflicts resolutions

app/models/license.rb

 class License < ActiveRecord::Base
   include ActionView::Helpers::NumberHelper
 
-  ADMIN_AUDIT_LOG_FEATURE = 'GitLab_AdminAuditLog'.freeze
-  AUDIT_EVENTS_FEATURE = 'GitLab_AuditEvents'.freeze
-  AUDITOR_USER_FEATURE = 'GitLab_Auditor_User'.freeze
-  BURNDOWN_CHARTS_FEATURE = 'GitLab_BurndownCharts'.freeze
-  CONTRIBUTION_ANALYTICS_FEATURE = 'GitLab_ContributionAnalytics'.freeze
-  CROSS_PROJECT_PIPELINES_FEATURE = 'GitLab_CrossProjectPipelines'.freeze
-  DB_LOAD_BALANCING_FEATURE = 'GitLab_DbLoadBalancing'.freeze
-  DEPLOY_BOARD_FEATURE = 'GitLab_DeployBoard'.freeze
-  ELASTIC_SEARCH_FEATURE = 'GitLab_ElasticSearch'.freeze
-  EXPORT_ISSUES_FEATURE  = 'GitLab_ExportIssues'.freeze
-  FAST_FORWARD_MERGE_FEATURE = 'GitLab_FastForwardMerge'.freeze
-  FILE_LOCKS_FEATURE = 'GitLab_FileLocks'.freeze
-  GEO_FEATURE = 'GitLab_Geo'.freeze
-  GROUP_WEBHOOKS_FEATURE = 'GitLab_GroupWebhooks'.freeze
-  ISSUABLE_DEFAULT_TEMPLATES_FEATURE = 'GitLab_IssuableDefaultTemplates'.freeze
-  ISSUE_BOARD_FOCUS_MODE_FEATURE = 'GitLab_IssueBoardFocusMode'.freeze
-  SCOPED_ISSUE_BOARD_FEATURE = 'GitLab_ScopedIssueBoard'.freeze
-  GROUP_ISSUE_BOARDS_FEATURE = 'GitLab_GroupIssueBoards'.freeze
-  ISSUE_WEIGHTS_FEATURE = 'GitLab_IssueWeights'.freeze
-  JENKINS_INTEGRATION_FEATURE = 'GitLab_JenkinsIntegration'.freeze
-  JIRA_DEV_PANEL_INTEGRATION_FEATURE = 'GitLab_JiraDevelopmentPanelIntegration'.freeze
-  LDAP_EXTRAS_FEATURE = 'GitLab_LdapExtras'.freeze
-  MERGE_REQUEST_APPROVERS_FEATURE = 'GitLab_MergeRequestApprovers'.freeze
-  MERGE_REQUEST_REBASE_FEATURE = 'GitLab_MergeRequestRebase'.freeze
-  MERGE_REQUEST_SQUASH_FEATURE = 'GitLab_MergeRequestSquash'.freeze
-  MULTIPLE_ISSUE_ASSIGNEES_FEATURE = 'GitLab_MultipleIssueAssignees'.freeze
-  MULTIPLE_ISSUE_BOARDS_FEATURE = 'GitLab_MultipleIssueBoards'.freeze
-  OBJECT_STORAGE_FEATURE = 'GitLab_ObjectStorage'.freeze
-  PROTECTED_REFS_FOR_USERS_FEATURE = 'GitLab_RefPermissionsForUsers'.freeze
-  PUSH_RULES_FEATURE = 'GitLab_PushRules'.freeze
-  RELATED_ISSUES_FEATURE = 'GitLab_RelatedIssues'.freeze
-  REPOSITORY_MIRRORS_FEATURE = 'GitLab_RepositoryMirrors'.freeze
-  REPOSITORY_SIZE_LIMIT_FEATURE = 'GitLab_RepositorySizeLimit'.freeze
-  SERVICE_DESK_FEATURE = 'GitLab_ServiceDesk'.freeze
-  VARIABLE_ENVIRONMENT_SCOPE_FEATURE = 'GitLab_VariableEnvironmentScope'.freeze
-
-  FEATURE_CODES = {
-    admin_audit_log: ADMIN_AUDIT_LOG_FEATURE,
-    auditor_user: AUDITOR_USER_FEATURE,
-    db_load_balancing: DB_LOAD_BALANCING_FEATURE,
-    elastic_search: ELASTIC_SEARCH_FEATURE,
-    geo: GEO_FEATURE,
-    ldap_extras: LDAP_EXTRAS_FEATURE,
-    object_storage: OBJECT_STORAGE_FEATURE,
-    related_issues: RELATED_ISSUES_FEATURE,
-    repository_size_limit: REPOSITORY_SIZE_LIMIT_FEATURE,
-    service_desk: SERVICE_DESK_FEATURE,
-    variable_environment_scope: VARIABLE_ENVIRONMENT_SCOPE_FEATURE,
-
-    # Features that make sense to Namespace:
-    audit_events: AUDIT_EVENTS_FEATURE,
-    burndown_charts: BURNDOWN_CHARTS_FEATURE,
-    contribution_analytics: CONTRIBUTION_ANALYTICS_FEATURE,
-    cross_project_pipelines: CROSS_PROJECT_PIPELINES_FEATURE,
-    deploy_board: DEPLOY_BOARD_FEATURE,
-    export_issues: EXPORT_ISSUES_FEATURE,
-    fast_forward_merge: FAST_FORWARD_MERGE_FEATURE,
-    file_locks: FILE_LOCKS_FEATURE,
-    group_webhooks: GROUP_WEBHOOKS_FEATURE,
-    issuable_default_templates: ISSUABLE_DEFAULT_TEMPLATES_FEATURE,
-    issue_board_focus_mode: ISSUE_BOARD_FOCUS_MODE_FEATURE,
-    scoped_issue_board: SCOPED_ISSUE_BOARD_FEATURE,
-    group_issue_boards: GROUP_ISSUE_BOARDS_FEATURE,
-    issue_weights: ISSUE_WEIGHTS_FEATURE,
-    jenkins_integration: JENKINS_INTEGRATION_FEATURE,
-    jira_dev_panel_integration: JIRA_DEV_PANEL_INTEGRATION_FEATURE,
-    merge_request_approvers: MERGE_REQUEST_APPROVERS_FEATURE,
-    merge_request_rebase: MERGE_REQUEST_REBASE_FEATURE,
-    merge_request_squash: MERGE_REQUEST_SQUASH_FEATURE,
-    multiple_issue_assignees: MULTIPLE_ISSUE_ASSIGNEES_FEATURE,
-    multiple_issue_boards: MULTIPLE_ISSUE_BOARDS_FEATURE,
-    protected_refs_for_users: PROTECTED_REFS_FOR_USERS_FEATURE,
-    push_rules: PUSH_RULES_FEATURE,
-    repository_mirrors: REPOSITORY_MIRRORS_FEATURE
-  }.freeze
-
   STARTER_PLAN = 'starter'.freeze
   PREMIUM_PLAN = 'premium'.freeze
   ULTIMATE_PLAN = 'ultimate'.freeze
@@ -92,7 +16,7 @@ class License < ActiveRecord::Base
     group_webhooks
     issuable_default_templates
     issue_board_focus_mode
-    scoped_issue_board
+    issue_board_milestone
     issue_weights
     jenkins_integration
     ldap_extras
@@ -106,6 +30,7 @@ class License < ActiveRecord::Base
     related_issues
     repository_mirrors
     repository_size_limit
+    scoped_issue_board
   ].freeze
 
   EEP_FEATURES = EES_FEATURES + %i[
@@ -132,40 +57,31 @@ class License < ActiveRecord::Base
   # Obs.: Do not extend from other feature constants.
   # Early adopters should not earn new features as they're
   # introduced.
-  EARLY_ADOPTER_FEATURES = [
-    { ADMIN_AUDIT_LOG_FEATURE => 1 },
-    { AUDIT_EVENTS_FEATURE => 1 },
-    { AUDITOR_USER_FEATURE => 1 },
-    { BURNDOWN_CHARTS_FEATURE => 1 },
-    { CONTRIBUTION_ANALYTICS_FEATURE => 1 },
-    { CROSS_PROJECT_PIPELINES_FEATURE => 1 },
-    { DB_LOAD_BALANCING_FEATURE => 1 },
-    { DEPLOY_BOARD_FEATURE => 1 },
-    { ELASTIC_SEARCH_FEATURE => 1 },
-    { EXPORT_ISSUES_FEATURE => 1 },
-    { FAST_FORWARD_MERGE_FEATURE => 1 },
-    { FILE_LOCKS_FEATURE => 1 },
-    { GEO_FEATURE => 1 },
-    { GROUP_WEBHOOKS_FEATURE => 1 },
-    { ISSUABLE_DEFAULT_TEMPLATES_FEATURE => 1 },
-    { ISSUE_BOARD_FOCUS_MODE_FEATURE => 1 },
-    { SCOPED_ISSUE_BOARD_FEATURE => 1 },
-    { ISSUE_WEIGHTS_FEATURE => 1 },
-    { JENKINS_INTEGRATION_FEATURE => 1 },
-    { LDAP_EXTRAS_FEATURE => 1 },
-    { MERGE_REQUEST_APPROVERS_FEATURE => 1 },
-    { MERGE_REQUEST_REBASE_FEATURE => 1 },
-    { MERGE_REQUEST_SQUASH_FEATURE => 1 },
-    { MULTIPLE_ISSUE_ASSIGNEES_FEATURE => 1 },
-    { MULTIPLE_ISSUE_BOARDS_FEATURE => 1 },
-    { OBJECT_STORAGE_FEATURE => 1 },
-    { PROTECTED_REFS_FOR_USERS_FEATURE => 1 },
-    { PUSH_RULES_FEATURE => 1 },
-    { RELATED_ISSUES_FEATURE => 1 },
-    { REPOSITORY_MIRRORS_FEATURE => 1 },
-    { REPOSITORY_SIZE_LIMIT_FEATURE => 1 },
-    { SERVICE_DESK_FEATURE => 1 },
-    { VARIABLE_ENVIRONMENT_SCOPE_FEATURE => 1 }
+  EARLY_ADOPTER_FEATURES = %i[
+    audit_events
+    burndown_charts
+    contribution_analytics
+    cross_project_pipelines
+    deploy_board
+    export_issues
+    fast_forward_merge
+    file_locks
+    group_webhooks
+    issuable_default_templates
+    issue_board_focus_mode
+    issue_weights
+    jenkins_integration
+    merge_request_approvers
+    merge_request_rebase
+    merge_request_squash
+    multiple_issue_assignees
+    multiple_issue_boards
+    protected_refs_for_users
+    push_rules
+    related_issues
+    repository_mirrors
+    service_desk
+    variable_environment_scope
   ].freeze
 
   FEATURES_BY_PLAN = {