Merge branch 'develop' into feature/account-export

This commit is contained in:
Mark Felder 2020-10-27 15:16:22 -05:00
commit f2b74f60f0

View File

@ -38,7 +38,6 @@ defmodule Pleroma.Web.Endpoint.MetricsExporterTest do
for metric <- [ for metric <- [
"http_requests_total", "http_requests_total",
"http_request_duration_microseconds", "http_request_duration_microseconds",
"phoenix_controller_render_duration",
"phoenix_controller_call_duration", "phoenix_controller_call_duration",
"telemetry_scrape_duration", "telemetry_scrape_duration",
"erlang_vm_memory_atom_bytes_total" "erlang_vm_memory_atom_bytes_total"