bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes after rebase

This commit is contained in:
Alexander Strizhakov 2020-09-02 10:29:36 +03:00
parent f679486540
commit b081080dd9
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/endpoint.ex
View File

@ -29,7 +29,7 @@ defmodule Pleroma.Web.Endpoint do
) )
# Careful! No `only` restriction here, as we don't know what frontends contain. # Careful! No `only` restriction here, as we don't know what frontends contain.
plug(Pleroma.Plugs.FrontendStatic, plug(Pleroma.Web.Plugs.FrontendStatic,
at: "/", at: "/",
frontend_type: :primary, frontend_type: :primary,
gzip: true, gzip: true,
@ -41,7 +41,7 @@ defmodule Pleroma.Web.Endpoint do
plug(Plug.Static.IndexHtml, at: "/pleroma/admin/") plug(Plug.Static.IndexHtml, at: "/pleroma/admin/")
plug(Pleroma.Plugs.FrontendStatic, plug(Pleroma.Web.Plugs.FrontendStatic,
at: "/pleroma/admin", at: "/pleroma/admin",
frontend_type: :admin, frontend_type: :admin,
gzip: true, gzip: true,

2
lib/pleroma/plugs/frontend_static.ex → lib/pleroma/web/plugs/frontend_static.ex
View File

@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.FrontendStatic do defmodule Pleroma.Web.Plugs.FrontendStatic do
require Pleroma.Constants require Pleroma.Constants
@moduledoc """ @moduledoc """

2
lib/pleroma/web/plugs/instance_static.ex
View File

@ -16,7 +16,7 @@ def file_path(path) do
instance_path = instance_path =
Path.join(Pleroma.Config.get([:instance, :static_dir], "instance/static/"), path) Path.join(Pleroma.Config.get([:instance, :static_dir], "instance/static/"), path)
frontend_path = Pleroma.Plugs.FrontendStatic.file_path(path, :primary) frontend_path = Pleroma.Web.Plugs.FrontendStatic.file_path(path, :primary)
(File.exists?(instance_path) && instance_path) || (File.exists?(instance_path) && instance_path) ||
(frontend_path && File.exists?(frontend_path) && frontend_path) || (frontend_path && File.exists?(frontend_path) && frontend_path) ||

2
test/mix/tasks/pleroma/frontend_test.exs
View File

@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.FrontendTest do defmodule Mix.Tasks.Pleroma.FrontendTest do
use Pleroma.DataCase use Pleroma.DataCase
alias Mix.Tasks.Pleroma.Frontend alias Mix.Tasks.Pleroma.Frontend

0
test/web/activity_pub/transmogrifier/event_handling_test.exs → test/pleroma/web/activity_pub/transmogrifier/event_handling_test.exs
View File