Merge branch 'develop' into issue/1934-welcome-email
This commit is contained in:
commit
67ab9a7928
47 changed files with 579 additions and 174 deletions
|
|
@ -539,16 +539,14 @@ config :pleroma, :workers,
|
|||
federator_outgoing: 5
|
||||
]
|
||||
|
||||
config :auto_linker,
|
||||
opts: [
|
||||
extra: true,
|
||||
# TODO: Set to :no_scheme when it works properly
|
||||
validate_tld: true,
|
||||
class: false,
|
||||
strip_prefix: false,
|
||||
new_window: false,
|
||||
rel: "ugc"
|
||||
]
|
||||
config :pleroma, Pleroma.Formatter,
|
||||
class: false,
|
||||
rel: "ugc",
|
||||
new_window: false,
|
||||
truncate: false,
|
||||
strip_prefix: false,
|
||||
extra: true,
|
||||
validate_tld: :no_scheme
|
||||
|
||||
config :pleroma, :ldap,
|
||||
enabled: System.get_env("LDAP_ENABLED") == "true",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue