diff options
| author | Roger Rüttimann <ror@panter.ch> | 2019-02-05 13:01:50 +0100 |
|---|---|---|
| committer | Roger Rüttimann <ror@panter.ch> | 2019-02-05 13:01:50 +0100 |
| commit | 28afbe46062797d4301f3bcf74bd7b11017090fe (patch) | |
| tree | 8a93622fe96a20b2694a4390d8f1fb15f0852d16 | |
| parent | 3197cd9b6cffadee9e5d633bd7d1f7673d1b9229 (diff) | |
| download | gitlab-ce-28afbe46062797d4301f3bcf74bd7b11017090fe.tar.gz | |
remove unnuesd global regex flag g
| -rw-r--r-- | app/helpers/users_helper.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/users_helper_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 949ca5fa5ec..73c1402eae5 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -30,7 +30,7 @@ module UsersHelper pattern, options = if settings.user_default_internal_regex_enabled? regex = settings.user_default_internal_regex_instance - JsRegex.new(regex, options: 'g').to_h.slice(:source, :options).values + JsRegex.new(regex).to_h.slice(:source, :options).values end { user_internal_regex_pattern: pattern, user_internal_regex_options: options } diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index 34d9115a1f6..ab67a5ab847 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/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 |