Merge branch 'gitaly-deny-disk-access-2' into 'master'

EE-specific repository disk access exceptions, part 2

See merge request gitlab-org/gitlab-ee!6219

ee/lib/ee/gitlab/gitaly_client.rb

-module EE
-  module Gitlab
-    module GitalyClient
-      extend ::Gitlab::Utils::Override
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        # TODO add override once 'explicit_opt_in_required' exists in GitalyClient
-        def explicit_opt_in_required
-          [::Gitlab::GitalyClient::StorageSettings::DISK_ACCESS_DENIED_FLAG]
-        end
-      end
-    end
-  end
-end

lib/gitlab/gitaly_client.rb

@@ -6,8 +6,6 @@ require 'grpc/health/v1/health_services_pb'
 
 module Gitlab
   module GitalyClient
-    prepend ::EE::Gitlab::GitalyClient
-
     include Gitlab::Metrics::Methods
     module MigrationStatus
       DISABLED = 1