logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: b57db828c7555e319c5ced4c1804c9f581ef5cdc
parent: 1881680e28273035333a121e2135781f1ae3f15a
Author: rinpatch <rinpatch@sdf.org>
Date:   Wed,  9 Jan 2019 18:42:00 +0000

Merge branch 'hotfix/ogp-cachex-fix' into 'develop'

Rich media: Remove :commit since a tuple is already returned

See merge request pleroma/pleroma!649

Diffstat:

Mlib/pleroma/web/rich_media/parser.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Web.RichMedia.Parser do def parse(url), do: parse_url(url) else def parse(url), - do: {:commit, Cachex.fetch!(:rich_media_cache, url, fn _ -> parse_url(url) end)} + do: Cachex.fetch!(:rich_media_cache, url, fn _ -> parse_url(url) end) end defp parse_url(url) do