logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: f2b74f60f056232af4fc7d3f3397cc7477024ee7
parent 291189357b2140db6d6ff1f51522e597690f9fb5
Author: Mark Felder <feld@FreeBSD.org>
Date:   Tue, 27 Oct 2020 15:16:22 -0500

Merge branch 'develop' into feature/account-export

Diffstat:

Mtest/pleroma/web/endpoint/metrics_exporter_test.exs1-
1 file changed, 0 insertions(+), 1 deletion(-)

diff --git a/test/pleroma/web/endpoint/metrics_exporter_test.exs b/test/pleroma/web/endpoint/metrics_exporter_test.exs @@ -38,7 +38,6 @@ defmodule Pleroma.Web.Endpoint.MetricsExporterTest do for metric <- [ "http_requests_total", "http_request_duration_microseconds", - "phoenix_controller_render_duration", "phoenix_controller_call_duration", "telemetry_scrape_duration", "erlang_vm_memory_atom_bytes_total"