diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
| commit | ba5e8a644463a19b863e862def80adb6a5a1060b (patch) | |
| tree | b00fdfbfe13979454dcad185e8c0c7de237d8a0f /config/description.exs | |
| parent | e442ea5722404ca551135b6f4767c016952bbda3 (diff) | |
| parent | f1d5c0f07963c23d264311985c21837b9b03fd5a (diff) | |
| download | pleroma-ba5e8a644463a19b863e862def80adb6a5a1060b.tar.gz pleroma-ba5e8a644463a19b863e862def80adb6a5a1060b.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/config/description.exs b/config/description.exs index b9b696e42..5f3c58b08 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2749,43 +2749,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, |