Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 1 deletions

diff --git a/metrics_server/override_rails_constants.rb b/metrics_server/override_rails_constants.rb
new file mode 100644
index 00000000000..76e49edfbb0
--- /dev/null
+++ b/metrics_server/override_rails_constants.rb
@@ -0,0 +1,20 @@
+# rubocop:disable Naming/FileName
+# frozen_string_literal: true
+
+require 'active_support/environment_inquirer'
+
+module Rails
+  extend self
+
+  def env
+    @env ||= ActiveSupport::EnvironmentInquirer.new(
+      ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "development"
+    )
+  end
+
+  def root
+    Pathname.new(File.expand_path('..', __dir__))
+  end
+end
+
+# rubocop:enable Naming/FileName
diff --git a/metrics_server/settings_overrides.rb b/metrics_server/settings_overrides.rb
index 4239f62ad1c..8572b4f86b0 100644
--- a/metrics_server/settings_overrides.rb
+++ b/metrics_server/settings_overrides.rb
@@ -7,7 +7,7 @@
 # to all necessary constants. For example, we need Rails.root to
 # determine the location of bin/metrics-server.
 # Here we make the necessary constants available conditionally.
-require_relative '../scripts/override_rails_constants' unless Object.const_defined?('Rails')
+require_relative 'override_rails_constants' unless Object.const_defined?('Rails')
 
 require_relative '../config/settings'