diff options
| author | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
| commit | 84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa (patch) | |
| tree | 80664a6152e92abb37133fede9e3ed72c6801910 /benchmarks/load_testing | |
| parent | 4ca380490f1e42ef6b12c4b12ba9efabb89472fd (diff) | |
| parent | 64bc0c69ed6b77283905b04585f03c23cbedbe03 (diff) | |
| download | pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.tar.gz pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.zip | |
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'benchmarks/load_testing')
| -rw-r--r-- | benchmarks/load_testing/activities.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/benchmarks/load_testing/activities.ex b/benchmarks/load_testing/activities.ex index f5c7bfce8..b9f6b24da 100644 --- a/benchmarks/load_testing/activities.ex +++ b/benchmarks/load_testing/activities.ex @@ -299,7 +299,7 @@ defmodule Pleroma.LoadTesting.Activities do "url" => [ %{ "href" => - "#{Pleroma.Web.base_url()}/media/b1b873552422a07bf53af01f3c231c841db4dfc42c35efde681abaf0f2a4eab7.jpg", + "#{Pleroma.Web.Endpoint.url()}/media/b1b873552422a07bf53af01f3c231c841db4dfc42c35efde681abaf0f2a4eab7.jpg", "mediaType" => "image/jpeg", "type" => "Link" } |