VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-29 12:00:32 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2024-08-23 09:09:28 +00:00
parent a33d103465
commit f3af1e76dc
26 changed files with 347 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab_settings/options.rb
View File

@ -93,6 +93,10 @@ module GitlabSettings
@options = to_hash.merge(other.deep_stringify_keys)
end
def reverse_merge!(other)
@options = to_hash.reverse_merge(other.deep_stringify_keys)
end
def deep_merge(other)
self.class.build(to_hash.deep_merge(other.deep_stringify_keys))
end