diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-01 09:12:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-01 09:12:25 +0300 |
| commit | 2bfa43cf3a8b0bb25a85066ff48db58f068bc493 (patch) | |
| tree | 7ba5f89b4953742f025f5c8e0911cd1f964bb2e5 /app/models/gpg_key.rb | |
| parent | 188f99dcc3de4678b308851d1cd8d26a200393cd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/gpg_key.rb')
| -rw-r--r-- | app/models/gpg_key.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb index a56e28859c9..2db074e733e 100644 --- a/app/models/gpg_key.rb +++ b/app/models/gpg_key.rb @@ -21,7 +21,7 @@ class GpgKey < ApplicationRecord presence: true, uniqueness: true, format: { - with: /\A#{KEY_PREFIX}((?!#{KEY_PREFIX})(?!#{KEY_SUFFIX}).)+#{KEY_SUFFIX}\Z/m, + with: /\A#{KEY_PREFIX}((?!#{KEY_PREFIX})(?!#{KEY_SUFFIX}).)+#{KEY_SUFFIX}\Z/mo, message: "is invalid. A valid public GPG key begins with '#{KEY_PREFIX}' and ends with '#{KEY_SUFFIX}'" } |