Prepend EE::Gitlab::Regex into Gitlab::Regex

This ensures that we modify Gitlab::Regex using EE specific modules the
same way as we do with other modules/classes.

ee/lib/ee/gitlab/regex.rb

@@ -3,41 +3,45 @@
 module EE
   module Gitlab
     module Regex
-      def environment_scope_regex_chars
-        "#{environment_name_regex_chars}\\*"
-      end
+      extend ActiveSupport::Concern
 
-      def environment_scope_regex
-        @environment_scope_regex ||= /\A[#{environment_scope_regex_chars}]+\z/.freeze
-      end
+      class_methods do
+        def environment_scope_regex_chars
+          "#{environment_name_regex_chars}\\*"
+        end
 
-      def environment_scope_regex_message
-        "can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.', '*' and spaces"
-      end
+        def environment_scope_regex
+          @environment_scope_regex ||= /\A[#{environment_scope_regex_chars}]+\z/.freeze
+        end
 
-      def package_name_regex
-        @package_name_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.]*)\z}.freeze
-      end
+        def environment_scope_regex_message
+          "can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.', '*' and spaces"
+        end
 
-      def maven_path_regex
-        @maven_path_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.\+]*)\z}.freeze
-      end
+        def package_name_regex
+          @package_name_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.]*)\z}.freeze
+        end
 
-      def maven_app_name_regex
-        @maven_app_name_regex ||= /\A[\w\-\.]+\z/.freeze
-      end
+        def maven_path_regex
+          @maven_path_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.\+]*)\z}.freeze
+        end
 
-      def maven_app_group_regex
-        maven_app_name_regex
-      end
+        def maven_app_name_regex
+          @maven_app_name_regex ||= /\A[\w\-\.]+\z/.freeze
+        end
 
-      def feature_flag_regex
-        /\A[a-z]([-_a-z0-9]*[a-z0-9])?\z/
-      end
+        def maven_app_group_regex
+          maven_app_name_regex
+        end
+
+        def feature_flag_regex
+          /\A[a-z]([-_a-z0-9]*[a-z0-9])?\z/
+        end
 
-      def feature_flag_regex_message
-        "can contain only lowercase letters, digits, '_' and '-'. " \
-        "Must start with a letter, and cannot end with '-' or '_'"
+        def feature_flag_regex_message
+          "can contain only lowercase letters, digits, '_' and '-'. " \
+          "Must start with a letter, and cannot end with '-' or '_'"
+        end
       end
     end
   end

lib/gitlab/regex.rb

@@ -3,7 +3,6 @@
 module Gitlab
   module Regex
     extend self
-    extend EE::Gitlab::Regex # rubocop: disable Cop/InjectEnterpriseEditionModule
 
     def namespace_name_regex
       @namespace_name_regex ||= /\A[\p{Alnum}\p{Pd}_\. ]*\z/.freeze
@@ -108,3 +107,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Regex.prepend(EE::Gitlab::Regex)