diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-02-06 15:04:21 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-06 15:04:21 +0300 |
| commit | 6769ecd948c8bd69bc9ba7af7d291142dc062af1 (patch) | |
| tree | 5f9d3e268341e92acc1e4aed6d7f5741c400a273 /config | |
| parent | 6722dade42d5f404c00386b0336d821028d58d7c (diff) | |
| parent | 15cb1f6804fde19330a3c1f06eb24802c7503be3 (diff) | |
| download | pleroma-6769ecd948c8bd69bc9ba7af7d291142dc062af1.tar.gz pleroma-6769ecd948c8bd69bc9ba7af7d291142dc062af1.zip | |
Merge branch 'develop' into fix/dymamic-docs
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 60c982557..34716cf37 100644 --- a/config/config.exs +++ b/config/config.exs @@ -509,7 +509,6 @@ config :pleroma, :fetch_initial_posts, config :auto_linker, opts: [ - scheme: true, extra: true, # TODO: Set to :no_scheme when it works properly validate_tld: true, diff --git a/config/description.exs b/config/description.exs index 1ffb66287..a4d1a74a7 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2181,11 +2181,6 @@ config :pleroma, :config_description, [ description: "Set to `false` to remove target='_blank' attribute" }, %{ - key: :scheme, - type: :boolean, - description: "Set to `true` to link urls with schema http://google.com" - }, - %{ key: :truncate, type: [:integer, false], description: |