diff options
| author | lain <lain@soykaf.club> | 2020-05-22 16:05:35 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-22 16:05:35 +0000 |
| commit | ddbbefeb2e30afbf86601c4eaf99b5cf00546548 (patch) | |
| tree | e271de23edd79bac661898bc2e25e7c14b6a997e /config | |
| parent | 1fa7aa9fc544e9c9b55ecc1a92d93c95eabcfa62 (diff) | |
| parent | 5d60b25e690eb21ad2539a10036ba39489f62f97 (diff) | |
| download | pleroma-ddbbefeb2e30afbf86601c4eaf99b5cf00546548.tar.gz pleroma-ddbbefeb2e30afbf86601c4eaf99b5cf00546548.zip | |
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 1b11b4fa9..7385fb6c3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -71,7 +71,8 @@ config :pleroma, Pleroma.Upload, follow_redirect: true, pool: :upload ] - ] + ], + filename_display_max_length: 30 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" diff --git a/config/description.exs b/config/description.exs index cf7cc297a..807c945e0 100644 --- a/config/description.exs +++ b/config/description.exs @@ -119,6 +119,11 @@ config :pleroma, :config_description, [ ] } ] + }, + %{ + key: :filename_display_max_length, + type: :integer, + description: "Set max length of a filename to display. 0 = no limit. Default: 30" } ] }, |