summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2019-07-23 19:28:17 +0200
committerMatija Čupić <matteeyah@gmail.com>2019-07-23 21:22:26 +0200
commit136865713bbaeee03e45e9e7154dd99338d565d6 (patch)
treee4f71df7787d6bbedba1f647b8ad95711b5173c7 /app
parentb49115487a676497e9ee2a942a685bff073aea3b (diff)
downloadgitlab-ce-136865713bbaeee03e45e9e7154dd99338d565d6.tar.gz
Document new masking requirementsmc/feature/add-at-colon-variable-masking
Diffstat (limited to 'app')
-rw-r--r--app/models/concerns/maskable.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/maskable.rb b/app/models/concerns/maskable.rb
index 65679ac0e55..d70e47bc4ff 100644
--- a/app/models/concerns/maskable.rb
+++ b/app/models/concerns/maskable.rb
@@ -7,7 +7,8 @@ module Maskable
# * No escape characters
# * No variables
# * No spaces
- # * Minimal length of 8 characters from the Base64 alphabets (RFC4648)
+ # * Minimal length of 8 characters
+ # * Characters must be from the Base64 alphabet (RFC4648) with the addition of @ and :
# * Absolutely no fun is allowed
REGEX = /\A[a-zA-Z0-9_+=\/@:-]{8,}\z/.freeze