forked from AkkomaGang/akkoma
Merge branch 'develop' into stable
This commit is contained in:
commit
c887dd4f2e
4 changed files with 5 additions and 6 deletions
|
@ -158,8 +158,9 @@ def load_all_pleroma_modules do
|
||||||
|> String.to_existing_atom()
|
|> String.to_existing_atom()
|
||||||
|> Code.ensure_loaded!()
|
|> Code.ensure_loaded!()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
# Use this when 1.15 is standard
|
# Use this when 1.15 is standard
|
||||||
#|> Code.ensure_all_loaded!()
|
# |> Code.ensure_all_loaded!()
|
||||||
end
|
end
|
||||||
|
|
||||||
defp cachex_children do
|
defp cachex_children do
|
||||||
|
|
|
@ -110,7 +110,7 @@ defp merge_with_default(%{group: group, key: key, value: value} = setting) do
|
||||||
|
|
||||||
defp configure({_, :backends, _, merged}) do
|
defp configure({_, :backends, _, merged}) do
|
||||||
# removing current backends
|
# removing current backends
|
||||||
Enum.each(Application.get_env(:logger, :backends), &Logger.remove_backend/1)
|
Enum.each(Application.get_env(:logger, :backends, []), &Logger.remove_backend/1)
|
||||||
|
|
||||||
Enum.each(merged, &Logger.add_backend/1)
|
Enum.each(merged, &Logger.add_backend/1)
|
||||||
|
|
||||||
|
|
|
@ -34,9 +34,7 @@ def perform(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
|
||||||
permissions = Enum.join(missing_scopes, " #{op} ")
|
permissions = Enum.join(missing_scopes, " #{op} ")
|
||||||
|
|
||||||
error_message =
|
error_message =
|
||||||
dgettext("errors", "Insufficient permissions: %{permissions}.",
|
dgettext("errors", "Insufficient permissions: %{permissions}.", permissions: permissions)
|
||||||
permissions: permissions
|
|
||||||
)
|
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("application/json")
|
|> put_resp_content_type("application/json")
|
||||||
|
|
2
mix.exs
2
mix.exs
|
@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
|
||||||
def project do
|
def project do
|
||||||
[
|
[
|
||||||
app: :pleroma,
|
app: :pleroma,
|
||||||
version: version("3.10.2"),
|
version: version("3.10.3"),
|
||||||
elixir: "~> 1.14",
|
elixir: "~> 1.14",
|
||||||
elixirc_paths: elixirc_paths(Mix.env()),
|
elixirc_paths: elixirc_paths(Mix.env()),
|
||||||
compilers: [:phoenix] ++ Mix.compilers(),
|
compilers: [:phoenix] ++ Mix.compilers(),
|
||||||
|
|
Loading…
Reference in a new issue