Merge branch 'ee-lib-differences' into 'master'

EE: Resolve EE differences in the lib/ directory

Closes #13335

See merge request gitlab-org/gitlab-ee!15042

lib/gitlab/git_ref_validator.rb

@@ -6,15 +6,14 @@ module Gitlab
   module GitRefValidator
     extend self
 
-    EXPANDED_PREFIXES = %w(refs/heads/ refs/remotes/).freeze
-    DISALLOWED_PREFIXES = %w(-).freeze
+    EXPANDED_PREFIXES = %w[refs/heads/ refs/remotes/].freeze
+    DISALLOWED_PREFIXES = %w[-].freeze
 
     # Validates a given name against the git reference specification
     #
     # Returns true for a valid reference name, false otherwise
     def validate(ref_name)
-      return false if ref_name.start_with?(*EXPANDED_PREFIXES)
-      return false if ref_name.start_with?(*DISALLOWED_PREFIXES)
+      return false if ref_name.start_with?(*(EXPANDED_PREFIXES + DISALLOWED_PREFIXES))
       return false if ref_name == 'HEAD'
 
       begin

lib/gitlab/import_export/import_export.yml

@@ -71,9 +71,6 @@ project_tree:
   - protected_branches:
     - :merge_access_levels
     - :push_access_levels
-    - :unprotect_access_levels
-  - protected_environments:
-    - :deploy_access_levels
   - protected_tags:
     - :create_access_levels
   - :project_feature
@@ -87,9 +84,6 @@ project_tree:
     - lists:
       - label:
         - :priorities
-      - milestone:
-        - events:
-          - :push_event_payload
 
 # Only include the following attributes for the models specified.
 included_attributes:
@@ -128,18 +122,10 @@ excluded_attributes:
     - :last_activity_at
     - :last_repository_updated_at
     - :last_repository_check_at
-    - :mirror_user_id
-    - :mirror_trigger_builds
     - :storage_version
     - :remote_mirror_available_overridden
-    - :only_mirror_protected_branches
-    - :pull_mirror_available_overridden
-    - :mirror_overwrites_diverged_branches
     - :description_html
     - :repository_languages
-    - :packages_enabled
-    - :mirror_last_update_at
-    - :mirror_last_successful_update_at
     - :bfg_object_map
     - :detected_repository_languages
     - :tag_list