diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 06:06:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 06:06:12 +0300 |
| commit | f155cc9034f2247c5d368f9b0212ad44248b0c5e (patch) | |
| tree | 902480293b665d74a337aeae6a0521104f561988 /config | |
| parent | c920712fab6abdc37de9444e6bbcd170c295b21a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/fog_core_patch.rb | 2 | ||||
| -rw-r--r-- | config/initializers/zz_metrics.rb | 4 | ||||
| -rw-r--r-- | config/settings.rb | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/config/initializers/fog_core_patch.rb b/config/initializers/fog_core_patch.rb index d3d02216d45..053e0460a19 100644 --- a/config/initializers/fog_core_patch.rb +++ b/config/initializers/fog_core_patch.rb @@ -34,6 +34,7 @@ module Fog # Gems that have not yet updated with the new fog-core namespace LEGACY_FOG_PROVIDERS = %w(google rackspace aliyun).freeze + # rubocop:disable Gitlab/ConstGetInheritFalse def service_provider_constant(service_name, provider_name) args = service_provider_search_args(service_name, provider_name) Fog.const_get(args.first).const_get(*const_get_args(args.second)) @@ -48,5 +49,6 @@ module Fog [provider_name, service_name] end end + # rubocop:enable Gitlab/ConstGetInheritFalse end end diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 501ec8ccc06..bc28780cc77 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -13,7 +13,7 @@ def instrument_classes(instrumentation) instrumentation.instrument_methods(Gitlab::Git) Gitlab::Git.constants.each do |name| - const = Gitlab::Git.const_get(name) + const = Gitlab::Git.const_get(name, false) next unless const.is_a?(Module) @@ -75,7 +75,7 @@ def instrument_classes(instrumentation) instrumentation.instrument_instance_methods(Rouge::Formatters::HTMLGitlab) [:XML, :HTML].each do |namespace| - namespace_mod = Nokogiri.const_get(namespace) + namespace_mod = Nokogiri.const_get(namespace, false) instrumentation.instrument_methods(namespace_mod) instrumentation.instrument_methods(namespace_mod::Document) diff --git a/config/settings.rb b/config/settings.rb index 8756c120645..767c6c56337 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -104,10 +104,10 @@ class Settings < Settingslogic # check that `current` (string or integer) is a contant in `modul`. def verify_constant(modul, current, default) - constant = modul.constants.find { |name| modul.const_get(name) == current } - value = constant.nil? ? default : modul.const_get(constant) + constant = modul.constants.find { |name| modul.const_get(name, false) == current } + value = constant.nil? ? default : modul.const_get(constant, false) if current.is_a? String - value = modul.const_get(current.upcase) rescue default + value = modul.const_get(current.upcase, false) rescue default end value |