diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 20:34:13 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 20:39:20 +0300 |
| commit | 21a2a054070c26d7be1a0e453e5f40b20fbd59f2 (patch) | |
| tree | af2812719f0485e8d844b1251f0de1be28673395 /config | |
| parent | bfc70fdf29c2e1067179165ef686e6abe20896b0 (diff) | |
| parent | e8f22451da18aeba9bcf9f9f6acf93690ccb3cba (diff) | |
| download | pleroma-21a2a054070c26d7be1a0e453e5f40b20fbd59f2.tar.gz pleroma-21a2a054070c26d7be1a0e453e5f40b20fbd59f2.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/description.exs | 41 |
2 files changed, 2 insertions, 47 deletions
diff --git a/config/config.exs b/config/config.exs index 62aef5cf3..696b8ebf4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -411,14 +411,6 @@ config :pleroma, Pleroma.Web.Metadata, ], unfurl_nsfw: false -config :pleroma, :suggestions, - enabled: false, - third_party_engine: - "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}", - timeout: 300_000, - limit: 40, - web: "https://vinayaka.distsn.org" - config :pleroma, :http_security, enabled: true, sts: false, diff --git a/config/description.exs b/config/description.exs index 7829497fe..434fc2ef1 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1167,7 +1167,7 @@ config :pleroma, :config_description, [ label: "Logo margin", type: :string, description: - "allows you to adjust vertical margins between logo boundary and navbar borders. " <> + "Allows you to adjust vertical margins between logo boundary and navbar borders. " <> "The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.", suggestions: [".1em"] }, @@ -1960,7 +1960,7 @@ config :pleroma, :config_description, [ }, %{ key: :verbose, - type: :atom, + type: [:atom, false], description: "Logs verbose mode", suggestions: [false, :error, :warn, :info, :debug] }, @@ -2742,43 +2742,6 @@ config :pleroma, :config_description, [ ] }, %{ - group: :pleroma, - key: :suggestions, - type: :group, - children: [ - %{ - key: :enabled, - type: :boolean, - description: "Enables suggestions" - }, - %{ - key: :third_party_engine, - type: :string, - description: "URL for third party engine", - suggestions: [ - "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}" - ] - }, - %{ - key: :timeout, - type: :integer, - description: "Request timeout to third party engine", - suggestions: [300_000] - }, - %{ - key: :limit, - type: :integer, - description: "Limit for suggestions", - suggestions: [40] - }, - %{ - key: :web, - type: :string, - suggestions: ["https://vinayaka.distsn.org"] - } - ] - }, - %{ group: :prometheus, key: Pleroma.Web.Endpoint.MetricsExporter, type: :group, |