projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
[akkoma]
/
lib
/
pleroma
/
config
/
config_db.ex
diff --git
a/lib/pleroma/config/config_db.ex
b/lib/pleroma/config/config_db.ex
index 2f4eb8581dba09e75552acea45388f230f7b9108..e5b7811aa51b27530ef020d5bcaa0813018b9798 100644
(file)
--- a/
lib/pleroma/config/config_db.ex
+++ b/
lib/pleroma/config/config_db.ex
@@
-156,7
+156,6
@@
defmodule Pleroma.ConfigDB do
{:quack, :meta},
{:mime, :types},
{:cors_plug, [:max_age, :methods, :expose, :headers]},
{:quack, :meta},
{:mime, :types},
{:cors_plug, [:max_age, :methods, :expose, :headers]},
- {:auto_linker, :opts},
{:swarm, :node_blacklist},
{:logger, :backends}
]
{:swarm, :node_blacklist},
{:logger, :backends}
]
@@
-167,7
+166,9
@@
defmodule Pleroma.ConfigDB do
end)
end
end)
end
- @spec delete(map()) :: {:ok, ConfigDB.t()} | {:error, Changeset.t()}
+ @spec delete(ConfigDB.t() | map()) :: {:ok, ConfigDB.t()} | {:error, Changeset.t()}
+ def delete(%ConfigDB{} = config), do: Repo.delete(config)
+
def delete(params) do
search_opts = Map.delete(params, :subkeys)
def delete(params) do
search_opts = Map.delete(params, :subkeys)