diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 23:51:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 23:51:20 +0300 |
| commit | 3010dc9ecab0267dd17b82722a4c22c478ee9f07 (patch) | |
| tree | 85f2c64d1e449cee42424ab6cda68396d18743d8 /lib | |
| parent | 338041562770d6b88aec0e367f8378b4cdf5f918 (diff) | |
Add latest changes from gitlab-org/gitlab@16-0-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab_settings/options.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab_settings/options.rb b/lib/gitlab_settings/options.rb index 5bdac74c2f6..077c1aa944a 100644 --- a/lib/gitlab_settings/options.rb +++ b/lib/gitlab_settings/options.rb @@ -43,6 +43,10 @@ module GitlabSettings end alias_method :to_h, :to_hash + def dup + self.class.build(to_hash) + end + def merge(other) self.class.build(to_hash.merge(other.deep_stringify_keys)) end |