Commit 18d89a42 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch...

Merge branch '6635-extract-ee-specific-files-lines-for-app-controllers-admin-health_check_controller-rb' into 'master'

Extract EE code from Admin::HealthCheckController

Closes #6635

See merge request gitlab-org/gitlab-ee!8887
parents 745c1f56 ca594d2d
......@@ -2,9 +2,14 @@
class Admin::HealthCheckController < Admin::ApplicationController
def show
checks = ['standard']
checks << 'geo' if Gitlab::Geo.secondary?
@errors = HealthCheck::Utils.process_checks(checks)
end
private
def checks
['standard']
end
end
Admin::HealthCheckController.prepend(EE::Admin::HealthCheckController)
# frozen_string_literal: true
module EE
module Admin
module HealthCheckController
extend ::Gitlab::Utils::Override
include ::Gitlab::Utils::StrongMemoize
private
override :checks
def checks
strong_memoize(:checks) do
base_checks = super
base_checks << 'geo' if ::Gitlab::Geo.secondary?
base_checks
end
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment