projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12528ed
)
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess...
author
Mark Felder
<feld@feld.me>
Tue, 12 Jan 2021 22:34:24 +0000
(16:34 -0600)
committer
Mark Felder
<feld@feld.me>
Tue, 12 Jan 2021 22:34:24 +0000
(16:34 -0600)
lib/pleroma/upload.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/upload.ex
b/lib/pleroma/upload.ex
index 619a85e93f216483425916d89656a497064d2425..e714dc57b6f046c965e188fe95d6e955c21a41bd 100644
(file)
--- a/
lib/pleroma/upload.ex
+++ b/
lib/pleroma/upload.ex
@@
-249,7
+249,7
@@
defmodule Pleroma.Upload do
end
_ ->
- public_endpoint || upload_base_url
+ public_endpoint || upload_base_url
|| Pleroma.Web.base_url() <> "/media/"
end
end
end