diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 21:20:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 21:20:15 +0000 |
| commit | 92d5172ad42ebc62eb78cac21b1e236ad6ace580 (patch) | |
| tree | ca89437d4725caeb4e27682522061d3bab7e05b0 /app/models | |
| parent | f4a969f7f495978a7e656c69c929c9fdac111cff (diff) | |
| download | gitlab-ce-92d5172ad42ebc62eb78cac21b1e236ad6ace580.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-3-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/aws/role.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/aws/role.rb b/app/models/aws/role.rb index 54132be749d..7d34665082d 100644 --- a/app/models/aws/role.rb +++ b/app/models/aws/role.rb @@ -9,6 +9,7 @@ module Aws validates :role_external_id, uniqueness: true, length: { in: 1..64 } validates :role_arn, length: 1..2048, + allow_nil: true, format: { with: Gitlab::Regex.aws_arn_regex, message: Gitlab::Regex.aws_arn_regex_message |