diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 09:09:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 09:09:59 +0300 |
commit | 99f384810fcb98be5dc45c22552eb80a76021387 (patch) | |
tree | 21429d96a861d76467f32bc010a4b4b86ddf20db /vendor | |
parent | 40a8d9a482e10a5f337b19c07d2f93bd8f90851b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gems/attr_encrypted/lib/attr_encrypted.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vendor/gems/attr_encrypted/lib/attr_encrypted.rb b/vendor/gems/attr_encrypted/lib/attr_encrypted.rb index 82a14086ade..28508e6d260 100644 --- a/vendor/gems/attr_encrypted/lib/attr_encrypted.rb +++ b/vendor/gems/attr_encrypted/lib/attr_encrypted.rb @@ -186,6 +186,8 @@ module AttrEncrypted @attr_encrypted_options ||= superclass.attr_encrypted_options.dup end + # Encrypted attributes are ignored as part of ApplicationSetting Audit Event + # Log. If the prefix is updated then the corresponding Regex in ApplicationSettingChangesAuditor should also be updated. def attr_encrypted_default_options { prefix: 'encrypted_', |