diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 12:09:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 12:09:49 +0300 |
commit | 1e02d1c756e1b5e79453fcc805c9737bb6520fca (patch) | |
tree | d0a3b167272dfe32cbaa4c552082a4a3f831bfed /app/models/concerns | |
parent | 130b909c4fab338c54e3292ed0c4f548e26e46b9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/sensitive_serializable_hash.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/concerns/sensitive_serializable_hash.rb b/app/models/concerns/sensitive_serializable_hash.rb index 4ad8d16fcb9..794748483e4 100644 --- a/app/models/concerns/sensitive_serializable_hash.rb +++ b/app/models/concerns/sensitive_serializable_hash.rb @@ -19,8 +19,6 @@ module SensitiveSerializableHash # In general, prefer NOT to use serializable_hash / to_json / as_json in favor # of serializers / entities instead which has an allowlist of attributes def serializable_hash(options = nil) - return super if options && options[:unsafe_serialization_hash] - options = options.try(:dup) || {} options[:except] = Array(options[:except]).dup |