Update CHANGELOG and docs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c672275ecfae1525f45b562dc9894619eb5db32..8692dfef21e8fe101ae81f9cde39b0266efbda43 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - NodeInfo: `pleroma_emoji_reactions` to the `features` list.
 - Configuration: `:restrict_unauthenticated` setting, restrict access for unauthenticated users to timelines (public and federate), user profiles and statuses.
 - Configuration: Add `:database_config_whitelist` setting to whitelist settings which can be configured from AdminFE.
 - NodeInfo: `pleroma_emoji_reactions` to the `features` list.
 - Configuration: `:restrict_unauthenticated` setting, restrict access for unauthenticated users to timelines (public and federate), user profiles and statuses.
 - Configuration: Add `:database_config_whitelist` setting to whitelist settings which can be configured from AdminFE.

+- Configuration: `filename_display_max_length` option to set filename truncate limit, if filename display enabled (0 = no limit).

 - New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
 - Mix task to create trusted OAuth App.
 - Notifications: Added `follow_request` notification type.
 - New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
 - Mix task to create trusted OAuth App.
 - Notifications: Added `follow_request` notification type.


@@ -47,7 +48,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Healthcheck reporting the number of memory currently used, rather than allocated in total
 
 ### Fixed
 - Healthcheck reporting the number of memory currently used, rather than allocated in total

-- `InsertSkeletonsForDeletedUsers` failing on some instances 
+- `InsertSkeletonsForDeletedUsers` failing on some instances

 
 ## [2.0.3] - 2020-05-02
 
 
 ## [2.0.3] - 2020-05-02
 

diff --git a/config/description.exs b/config/description.exs
index cf7cc297a4d7ac4630dcc7a908a42064e6e77858..807c945e00ca990b3f44bdecf0e77b6f2f40f154 100644 (file)
--- 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"

       }
     ]
   },
       }
     ]
   },

diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index e8def466e7b451904b04f597257f1e99cd0e04f5..505acb293fcb5f02d13a61e16949e0106dc94a6d 100644 (file)
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -498,6 +498,7 @@ the source code is here: https://github.com/koto-bank/kocaptcha. The default end
 * `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host.
 * `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
 * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.
 * `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host.
 * `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
 * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.

+* `filename_display_max_length`: Set max length of a filename to display. 0 = no limit. Default: 30.

 
 !!! warning
     `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`.
 
 !!! warning
     `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`.