diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-14 09:17:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-14 09:17:00 +0000 |
| commit | f31aea1722c11263b17d01e4ac2f8ba214ffcd0f (patch) | |
| tree | 5a8795049bafae621a77a16e35583b0a1ed81fdc /spec | |
| parent | bc72b2f181f63ee4d5271480c990b7660fd997c8 (diff) | |
| parent | 1f0502df0a2759a9bdde3837bb57c667d3fa3c56 (diff) | |
| download | gitlab-ce-f31aea1722c11263b17d01e4ac2f8ba214ffcd0f.tar.gz | |
Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master'
Fix a bug where internal email pattern wasn't respected
Closes #52940
See merge request gitlab-org/gitlab-ce!22516
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/users/build_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/users/build_service_spec.rb b/spec/services/users/build_service_spec.rb index 051e8c87f39..17bc880dec5 100644 --- a/spec/services/users/build_service_spec.rb +++ b/spec/services/users/build_service_spec.rb @@ -159,9 +159,9 @@ describe Users::BuildService do true | true | 'fl@example.com' | '' | true true | false | 'fl@example.com' | '' | true - true | nil | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | true - true | true | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | true - true | false | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | true + true | nil | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | false + true | true | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | false + true | false | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | false true | nil | 'tester.ext@domain.com' | '^(?:(?!\.ext@).)*$\r?' | true true | true | 'tester.ext@domain.com' | '^(?:(?!\.ext@).)*$\r?' | true |