Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -197,7 +197,7 @@ gem 're2', '~> 1.1.1'
 gem 'version_sorter', '~> 2.1.0'
 
 # Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 3.1'
 
 # User agent parsing
 gem 'device_detector'

Gemfile.lock

@@ -121,6 +121,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     cause (0.1)
+    character_set (1.1.2)
     charlock_holmes (0.7.6)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
@@ -428,8 +429,10 @@ GEM
       oauth (~> 0.5, >= 0.5.0)
     jmespath (1.3.1)
     jquery-atwho-rails (1.3.2)
-    js_regex (2.2.1)
-      regexp_parser (>= 0.4.11, <= 0.5.0)
+    js_regex (3.1.1)
+      character_set (~> 1.1)
+      regexp_parser (~> 1.1)
+      regexp_property_values (~> 0.3)
     json (1.8.6)
     json-jwt (1.9.4)
       activesupport
@@ -731,7 +734,8 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.6.0)
       redis (>= 2.2, < 5)
-    regexp_parser (0.5.0)
+    regexp_parser (1.3.0)
+    regexp_property_values (0.3.4)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -1085,7 +1089,7 @@ DEPENDENCIES
   jaeger-client (~> 0.10.0)
   jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
-  js_regex (~> 2.2.1)
+  js_regex (~> 3.1)
   json-schema (~> 2.8.0)
   jwt (~> 2.1.0)
   kaminari (~> 1.0)

changelogs/unreleased/chore-update-js-regex.yml

+---
+title: Upgrade js-regex gem to version 3.1
+merge_request: 24433
+author: rroger
+type: changed

lib/tasks/gitlab/db.rake

@@ -29,10 +29,11 @@ namespace :gitlab do
       # If MySQL, turn off foreign key checks
       connection.execute('SET FOREIGN_KEY_CHECKS=0') if Gitlab::Database.mysql?
 
-      tables = connection.tables
+      tables = connection.data_sources
+      # Removes the entry from the array
       tables.delete 'schema_migrations'
       # Truncate schema_migrations to ensure migrations re-run
-      connection.execute('TRUNCATE schema_migrations')
+      connection.execute('TRUNCATE schema_migrations') if connection.data_source_exists? 'schema_migrations'
 
       # Drop tables with cascade to avoid dependent table errors
       # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html

spec/helpers/users_helper_spec.rb

@@ -51,7 +51,7 @@ describe UsersHelper do
       false | 'mockRegexPattern' | { user_internal_regex_pattern: nil, user_internal_regex_options: nil }
       true  | nil                | { user_internal_regex_pattern: nil, user_internal_regex_options: nil }
       true  | ''                 | { user_internal_regex_pattern: nil, user_internal_regex_options: nil }
-      true  | 'mockRegexPattern' | { user_internal_regex_pattern: 'mockRegexPattern', user_internal_regex_options: 'gi' }
+      true  | 'mockRegexPattern' | { user_internal_regex_pattern: 'mockRegexPattern', user_internal_regex_options: 'i' }
     end
 
     with_them do

spec/validators/js_regex_validator_spec.rb

@@ -12,8 +12,6 @@ describe JsRegexValidator do
       ''             | []
       '(?#comment)'  | ['Regex Pattern (?#comment) can not be expressed in Javascript']
       '(?(a)b|c)'    | ['invalid conditional pattern: /(?(a)b|c)/i']
-      '[a-z&&[^uo]]' | ["Dropped unsupported set intersection '[a-z&&[^uo]]' at index 0",
-                        "Dropped unsupported nested negative set data '[^uo]' at index 6"]
     end
 
     with_them do