diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
| commit | dc4814f0cdc12a552001e5e22c979060e4f3f865 (patch) | |
| tree | 38f8cb1729338768da447a27ae243c27d301c7bd /benchmarks/load_testing/activities.ex | |
| parent | 2de41770d04cf07ed8775a307b6d457a4750e265 (diff) | |
| parent | 0c56f9de0d607b88fd107e0bd13ef286f0629346 (diff) | |
| download | pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.tar.gz pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.zip | |
Fix merge conflicts with upstream
Diffstat (limited to 'benchmarks/load_testing/activities.ex')
| -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" } |