Mix format
This commit is contained in:
parent
1fa3c0b485
commit
522221f7fb
6 changed files with 16 additions and 21 deletions
|
@ -8,7 +8,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
|
||||||
alias Pleroma.Activity
|
alias Pleroma.Activity
|
||||||
alias Pleroma.Delivery
|
alias Pleroma.Delivery
|
||||||
alias Pleroma.Object
|
alias Pleroma.Object
|
||||||
alias Pleroma.Object.Fetcher
|
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
alias Pleroma.Web.ActivityPub.InternalFetchActor
|
alias Pleroma.Web.ActivityPub.InternalFetchActor
|
||||||
|
|
|
@ -5,11 +5,6 @@
|
||||||
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
|
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
alias Pleroma.Config
|
|
||||||
alias Pleroma.Stats
|
|
||||||
alias Pleroma.User
|
|
||||||
alias Pleroma.Web.Federator.Publisher
|
|
||||||
alias Pleroma.Web.MastodonAPI.InstanceView
|
|
||||||
alias Pleroma.Web.Endpoint
|
alias Pleroma.Web.Endpoint
|
||||||
alias Pleroma.Web.Nodeinfo.Nodeinfo
|
alias Pleroma.Web.Nodeinfo.Nodeinfo
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,9 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
|
||||||
font_src = "font-src 'self'"
|
font_src = "font-src 'self'"
|
||||||
|
|
||||||
script_src = "script-src 'self' '#{nonce_tag}' "
|
script_src = "script-src 'self' '#{nonce_tag}' "
|
||||||
script_src = if @mix_env == :dev do
|
|
||||||
|
script_src =
|
||||||
|
if @mix_env == :dev do
|
||||||
"script-src 'self' 'unsafe-eval' 'unsafe-inline'"
|
"script-src 'self' 'unsafe-eval' 'unsafe-inline'"
|
||||||
else
|
else
|
||||||
script_src
|
script_src
|
||||||
|
|
|
@ -423,7 +423,6 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
test "should not return 404 if local is specified" do
|
test "should not return 404 if local is specified" do
|
||||||
clear_config([:instance, :federated_timeline_available], false)
|
clear_config([:instance, :federated_timeline_available], false)
|
||||||
|
|
||||||
result =
|
|
||||||
build_conn()
|
build_conn()
|
||||||
|> get("/api/v1/timelines/public?local=true")
|
|> get("/api/v1/timelines/public?local=true")
|
||||||
|> json_response_and_validate_schema(200)
|
|> json_response_and_validate_schema(200)
|
||||||
|
|
Loading…
Reference in a new issue