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
ad180ad6
Commit
ad180ad6
authored
Dec 22, 2017
by
lain
Browse files
Merge branch 'media-proxy-fix-encoding' into 'develop'
Remove a useless URI.encode call in MediaProxy See merge request
!42
parents
35ac549a
0ccd0e5c
Pipeline
#453
passed with stage
in 3 minutes
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/media_proxy/controller.ex
View file @
ad180ad6
...
...
@@ -14,7 +14,6 @@ def remote(conn, %{"sig" => sig, "url" => url}) do
with
\
true
<-
Keyword
.
get
(
config
,
:enabled
,
false
),
{
:ok
,
url
}
<-
Pleroma
.
Web
.
MediaProxy
.
decode_url
(
sig
,
url
),
url
=
URI
.
encode
(
url
),
{
:ok
,
content_type
,
body
}
<-
proxy_request
(
url
)
do
conn
...
...
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