projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ci-test-fix' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
federating_plug.ex
diff --git
a/lib/pleroma/plugs/federating_plug.ex
b/lib/pleroma/plugs/federating_plug.ex
index 4108d90af267631dbdcedf805396941888bc7430..b5326d97b67108984653ba340e47139b26bb27db 100644
(file)
--- a/
lib/pleroma/plugs/federating_plug.ex
+++ b/
lib/pleroma/plugs/federating_plug.ex
@@
-5,13
+5,14
@@
defmodule Pleroma.Web.FederatingPlug do
options
end
options
end
- def call(conn, opts) do
+ def call(conn,
_
opts) do
if Keyword.get(Application.get_env(:pleroma, :instance), :federating) do
conn
else
conn
|> put_status(404)
if Keyword.get(Application.get_env(:pleroma, :instance), :federating) do
conn
else
conn
|> put_status(404)
- |> Phoenix.Controller.render(Pleroma.Web.ErrorView, "404.json")
+ |> Phoenix.Controller.put_view(Pleroma.Web.ErrorView)
+ |> Phoenix.Controller.render("404.json")
|> halt()
end
end
|> halt()
end
end