hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

Browse source 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
This commit is contained in:
Ivan Tashkinov 2020-07-02 16:36:54 +03:00
commit 61180ab6f4
464 changed files with 20888 additions and 9314 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/helpers/uri_helper.ex
View file

@ -17,11 +17,6 @@ defmodule Pleroma.Helpers.UriHelper do
|> URI.to_string()
end
def append_param_if_present(%{} = params, param_name, param_value) do
if param_value do
Map.put(params, param_name, param_value)
else
params
end
end
def maybe_add_base("/" <> uri, base), do: Path.join([base, uri])
def maybe_add_base(uri, _base), do: uri
end