diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-08-18 19:02:33 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-08-18 19:02:33 +0000 |
| commit | 3d5d8c05c9de9a70a8d49576f125b9987f9d34e8 (patch) | |
| tree | 44de972a82f2593b9d34378ddecb2acaf229be08 /config | |
| parent | fa8a87eca1892b094e5faafc48404dd1a75e4a57 (diff) | |
| parent | 52a79506c786a1388eeab24892c7b36ee9682977 (diff) | |
| download | pleroma-3d5d8c05c9de9a70a8d49576f125b9987f9d34e8.tar.gz | |
Merge branch '2064-image-blanking' into 'develop'
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index a7c9e54b1..1ed3157c3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -72,7 +72,8 @@ config :pleroma, Pleroma.Upload, pool: :upload ] ], - filename_display_max_length: 30 + filename_display_max_length: 30, + default_description: nil config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" diff --git a/config/test.exs b/config/test.exs index 413c7f0b9..f0358e384 100644 --- a/config/test.exs +++ b/config/test.exs @@ -21,7 +21,10 @@ config :logger, :console, config :pleroma, :auth, oauth_consumer_strategies: [] -config :pleroma, Pleroma.Upload, filters: [], link_name: false +config :pleroma, Pleroma.Upload, + filters: [], + link_name: false, + default_description: :filename config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" |