Resolve conflict in app/controllers/admin/health_check_controller.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/controllers/admin/health_check_controller.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
5f3caaf7 · Rémy Coutable · d1cb1b2b · 5f3caaf7
Commit 5f3caaf7 authored Aug 09, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/controllers/admin/health_check_controller.rb app/controllers/admin/health_check_controller.rb +0 -4

No files found.
--- a/app/controllers/admin/health_check_controller.rb
+++ b/app/controllers/admin/health_check_controller.rb
 class Admin::HealthCheckController < Admin::ApplicationController
  def show
-<<<<<<< HEAD
    checks = ['standard']
    checks << 'geo' if Gitlab::Geo.secondary?

    @errors = HealthCheck::Utils.process_checks(checks)
-=======
-    @errors = HealthCheck::Utils.process_checks(['standard'])
->>>>>>> upstream/master
    @failing_storage_statuses = Gitlab::Git::Storage::Health.for_failing_storages
  end