diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2019-07-23 19:20:32 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2019-07-23 21:22:25 +0200 |
| commit | 8e639cc687a1f73477d3062e2958a242a2437c21 (patch) | |
| tree | 7532d4aeae73a9063753670388dd387e9f451d14 | |
| parent | d892e80bf0161b535389c91ccb53539e4f08d790 (diff) | |
| download | gitlab-ce-8e639cc687a1f73477d3062e2958a242a2437c21.tar.gz | |
Allow masking @ and : characters
| -rw-r--r-- | app/models/concerns/maskable.rb | 2 | ||||
| -rw-r--r-- | spec/javascripts/ci_variable_list/ajax_variable_list_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/ci_variable_list/ci_variable_list_spec.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/maskable.rb b/app/models/concerns/maskable.rb index e0f2c41b836..65679ac0e55 100644 --- a/app/models/concerns/maskable.rb +++ b/app/models/concerns/maskable.rb @@ -9,7 +9,7 @@ module Maskable # * No spaces # * Minimal length of 8 characters from the Base64 alphabets (RFC4648) # * Absolutely no fun is allowed - REGEX = /\A[a-zA-Z0-9_+=\/-]{8,}\z/.freeze + REGEX = /\A[a-zA-Z0-9_+=\/@:-]{8,}\z/.freeze included do validates :masked, inclusion: { in: [true, false] } diff --git a/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js b/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js index e6a969bd855..b2fe315f6c6 100644 --- a/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js +++ b/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js @@ -224,7 +224,7 @@ describe('AjaxFormVariableList', () => { describe('maskableRegex', () => { it('takes in the regex provided by the data attribute', () => { - expect(container.dataset.maskableRegex).toBe('^[a-zA-Z0-9_+=/-]{8,}$'); + expect(container.dataset.maskableRegex).toBe('^[a-zA-Z0-9_+=/@:-]{8,}$'); expect(ajaxVariableList.maskableRegex).toBe(container.dataset.maskableRegex); }); }); diff --git a/spec/javascripts/ci_variable_list/ci_variable_list_spec.js b/spec/javascripts/ci_variable_list/ci_variable_list_spec.js index 064113e879a..c8d6f789ed0 100644 --- a/spec/javascripts/ci_variable_list/ci_variable_list_spec.js +++ b/spec/javascripts/ci_variable_list/ci_variable_list_spec.js @@ -162,7 +162,7 @@ describe('VariableList', () => { }); it('has a regex provided via a data attribute', () => { - expect($wrapper.attr('data-maskable-regex')).toBe('^[a-zA-Z0-9_+=/-]{8,}$'); + expect($wrapper.attr('data-maskable-regex')).toBe('^[a-zA-Z0-9_+=/@:-]{8,}$'); }); it('allows values that are 8 characters long', done => { |