From 4584816f15e57af3fbbf1d1280b691549384e1aa Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 22 Jun 2020 00:08:57 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/config/entry/configurable.rb | 4 +++- lib/gitlab/config/entry/node.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/gitlab/config') diff --git a/lib/gitlab/config/entry/configurable.rb b/lib/gitlab/config/entry/configurable.rb index 571e7a5127e..6bf77ebaa5b 100644 --- a/lib/gitlab/config/entry/configurable.rb +++ b/lib/gitlab/config/entry/configurable.rb @@ -62,7 +62,9 @@ module Gitlab class_methods do def nodes - Hash[(@nodes || {}).map { |key, factory| [key, factory.dup] }] + return {} unless @nodes + + @nodes.transform_values(&:dup) end def reserved_node_names diff --git a/lib/gitlab/config/entry/node.rb b/lib/gitlab/config/entry/node.rb index 84d3409ed91..f653df20b2e 100644 --- a/lib/gitlab/config/entry/node.rb +++ b/lib/gitlab/config/entry/node.rb @@ -68,7 +68,7 @@ module Gitlab value.specified? && value.relevant? end - Hash[meaningful.map { |key, entry| [key, entry.value] }] + meaningful.transform_values { |entry| entry.value } end end -- cgit v1.2.1