Add latest changes from gitlab-org/gitlab@12-9-stable-ee

4 files changed, 10 insertions, 3 deletions

diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb
index d327162b34e..2d0fdf98e8c 100644
--- a/lib/feature/gitaly.rb
+++ b/lib/feature/gitaly.rb
@@ -14,6 +14,9 @@ class Feature
       end
 
       def server_feature_flags
+        # We need to check that both the DB connection and table exists
+        return {} unless ::Gitlab::Database.cached_table_exists?(FlipperFeature.table_name)
+
         Feature.persisted_names
           .select { |f| f.start_with?(PREFIX) }
           .map do |f|
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index aa6085de4f9..56f7ffbe4f8 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -340,6 +340,7 @@ methods:
     - :diff_head_sha
     - :source_branch_sha
     - :target_branch_sha
+    - :state
   events:
     - :action
   push_event_payload:
@@ -350,6 +351,8 @@ methods:
     - :list_type
   ci_pipelines:
     - :notes
+  issues:
+    - :state
 
 preloads:
   statuses:
diff --git a/lib/gitlab/rate_limit_helpers.rb b/lib/gitlab/rate_limit_helpers.rb
index 2dcc888892b..653410a40a5 100644
--- a/lib/gitlab/rate_limit_helpers.rb
+++ b/lib/gitlab/rate_limit_helpers.rb
@@ -7,7 +7,7 @@ module Gitlab
     ARCHIVE_RATE_THROTTLE_KEY = :project_repositories_archive
 
     def archive_rate_limit_reached?(user, project)
-      return false unless Feature.enabled?(:archive_rate_limit, default_enabled: true)
+      return false unless Feature.enabled?(:archive_rate_limit)
 
       key = ARCHIVE_RATE_THROTTLE_KEY
 
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 66503621851..db531f06f11 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -17,11 +17,12 @@ module Gitlab
     end
 
     def group_name_regex
-      project_name_regex
+      @group_name_regex ||= /\A[\p{Alnum}\u{00A9}-\u{1f9ff}_][\p{Alnum}\p{Pd}\u{00A9}-\u{1f9ff}_()\. ]*\z/.freeze
     end
 
     def group_name_regex_message
-      project_name_regex_message
+      "can contain only letters, digits, emojis, '_', '.', dash, space, parenthesis. " \
+      "It must start with letter, digit, emoji or '_'."
     end
 
     ##