diff options
| author | lain <lain@soykaf.club> | 2020-07-09 13:09:31 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-09 13:09:31 +0000 |
| commit | f4469dc7419288a46512ea5cae6ffe32de5d47c2 (patch) | |
| tree | 554899b657aee1e79ec50f58d989ee4089e2b657 /config | |
| parent | bdc7b60610af7e1c9df7f01aa94c8992a3d6a516 (diff) | |
| parent | 31fef95e35d3cbc2d65c76a57ba8f4047809ce1b (diff) | |
| download | pleroma-f4469dc7419288a46512ea5cae6ffe32de5d47c2.tar.gz pleroma-f4469dc7419288a46512ea5cae6ffe32de5d47c2.zip | |
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 13 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 458d3a99a..3577cd101 100644 --- a/config/config.exs +++ b/config/config.exs @@ -706,6 +706,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata config :ex_aws, http_client: Pleroma.HTTP.ExAws +config :pleroma, :instances_favicons, enabled: false + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/description.exs b/config/description.exs index 705ba83d0..03b84bfc8 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3448,5 +3448,18 @@ config :pleroma, :config_description, [ suggestions: [false] } ] + }, + %{ + group: :pleroma, + key: :instances_favicons, + type: :group, + description: "Control favicons for instances", + children: [ + %{ + key: :enabled, + type: :boolean, + description: "Allow/disallow displaying and getting instances favicons" + } + ] } ] diff --git a/config/test.exs b/config/test.exs index e38b9967d..e6596e0bc 100644 --- a/config/test.exs +++ b/config/test.exs @@ -111,6 +111,8 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true +config :pleroma, :instances_favicons, enabled: true + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |