Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
7f7a1a46
Commit
7f7a1a46
authored
Jun 11, 2020
by
feld
Browse files
Check for media proxy base_url, not Upload base_url
parent
8a59fde0
Pipeline
#27104
passed with stages
in 9 minutes and 22 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
lib/pleroma/plugs/http_security_plug.ex
View file @
7f7a1a46
...
...
@@ -114,7 +114,7 @@ defp get_proxy_and_attachment_sources do
end
)
media_proxy_base_url
=
if
Config
.
get
([
Pleroma
.
Upload
,
:base_url
]),
if
Config
.
get
([
:media_proxy
,
:base_url
]),
do
:
URI
.
parse
(
Config
.
get
([
:media_proxy
,
:base_url
]))
.
host
upload_base_url
=
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment