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

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject

Browse source
This commit is contained in:
lain 2020-08-12 12:53:04 +02:00
commit bb92ad44a6
5 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/controller_helper.ex
View file

@ -18,6 +18,12 @@ defmodule Pleroma.Web.ControllerHelper do
def truthy_param?(value), do: not falsy_param?(value)
def json_response(conn, status, _) when status in [204, :no_content] do
conn
|> put_resp_header("content-type", "application/json")
|> send_resp(status, "")
end
def json_response(conn, status, json) do
conn
|> put_status(status)