diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-03-22 10:16:47 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-03-22 10:16:47 +0000 |
| commit | 685a85c6132fbd1f9e5ace08bd4b2808f3a50a8b (patch) | |
| tree | 69c859dd139acf847f594fe1526740ef065cb4f4 | |
| parent | 3ad7193cf9b959fce7210321869e16b4050a0b6f (diff) | |
| parent | d9951e250523e67223dcbe75e839a64421502665 (diff) | |
| download | gitlab-ce-685a85c6132fbd1f9e5ace08bd4b2808f3a50a8b.tar.gz | |
Merge branch 'docs/improve-regex-suggestion' into 'master'
Add end-of-string to regex example
Closes #58031
See merge request gitlab-org/gitlab-ce!26302
| -rw-r--r-- | doc/user/permissions.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 3b3dc60cb48..adc0f4d568b 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -25,7 +25,7 @@ See our [product handbook on permissions](https://about.gitlab.com/handbook/prod ## Instance-wide user permissions -By default, users can create top-level groups and change their +By default, users can create top-level groups and change their usernames. A GitLab administrator can configure the GitLab instance to [modify this behavior](../administration/user_settings.md). @@ -244,7 +244,7 @@ The regex pattern format is Ruby, but it needs to be convertible to JavaScript, Here are some examples: -- Use `\.internal@domain\.com` to mark email addresses containing ".internal@domain.com" internal. +- Use `\.internal@domain\.com$` to mark email addresses ending with ".internal@domain.com" internal. - Use `^(?:(?!\.ext@domain\.com).)*$\r?` to mark users with email addresses NOT including .ext@domain.com internal. Please be aware that this regex could lead to a DOS attack, [see](https://en.wikipedia.org/wiki/ReDoS?) ReDos on Wikipedia. |