diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-08 19:59:37 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-08 19:59:37 +0300 |
| commit | 4e6bbdc7b549e630141cb10d383a42055f06dc16 (patch) | |
| tree | d0675328c7fc75f612eab779289afabee27a40a8 /config | |
| parent | d458f4fdcafe847a7db8b1c663cfd945019816b7 (diff) | |
| parent | 964b4d82a0cde5b552b6210400c5e2c747a2f0e0 (diff) | |
| download | pleroma-4e6bbdc7b549e630141cb10d383a42055f06dc16.tar.gz pleroma-4e6bbdc7b549e630141cb10d383a42055f06dc16.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 17 |
2 files changed, 6 insertions, 12 deletions
diff --git a/config/config.exs b/config/config.exs index 62a10ca41..242355035 100644 --- a/config/config.exs +++ b/config/config.exs @@ -511,7 +511,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 9fd52f50e..5f7b6656c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -871,7 +871,7 @@ config :pleroma, :config_description, [ }, %{ key: :limit_to_local_content, - type: [:atom, false], + type: {:dropdown, :atom}, description: "Limit unauthenticated users to search for local statutes and users only. Default: `:unauthenticated`.", suggestions: [ @@ -942,7 +942,7 @@ config :pleroma, :config_description, [ children: [ %{ key: :level, - type: :atom, + type: {:dropdown, :atom}, description: "Log level", suggestions: [:debug, :info, :warn, :error] }, @@ -974,7 +974,7 @@ config :pleroma, :config_description, [ children: [ %{ key: :level, - type: :atom, + type: {:dropdown, :atom}, description: "Log level", suggestions: [:debug, :info, :warn, :error] }, @@ -998,7 +998,7 @@ config :pleroma, :config_description, [ children: [ %{ key: :level, - type: :atom, + type: {:dropdown, :atom}, description: "Log level", suggestions: [:debug, :info, :warn, :error] }, @@ -1975,7 +1975,7 @@ config :pleroma, :config_description, [ }, %{ key: :verbose, - type: [:atom, false], + type: {:dropdown, :atom}, description: "Logs verbose mode", suggestions: [false, :error, :warn, :info, :debug] }, @@ -2184,12 +2184,7 @@ config :pleroma, :config_description, [ %{ key: :new_window, type: :boolean, - 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" + description: "Link urls will open in new window/tab" }, %{ key: :truncate, |