diff options
| author | lain <lain@soykaf.club> | 2020-02-13 17:17:43 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-13 17:17:43 +0000 |
| commit | 18a56410b821f1583d216dc55b9bd7b4d3a9c327 (patch) | |
| tree | f2d2c6ea99903de009dfae33b713a6ced6224825 /config | |
| parent | 9bb66c0b65d0f5489a836f997971e56e52d752b9 (diff) | |
| parent | b312c36b8e14b6aaa450bd8509e320c9784d0f48 (diff) | |
| download | pleroma-18a56410b821f1583d216dc55b9bd7b4d3a9c327.tar.gz pleroma-18a56410b821f1583d216dc55b9bd7b4d3a9c327.zip | |
Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'
Fix the confusingly named and inverted logic of "no_attachment_links"
See merge request pleroma/pleroma!2202
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 41c1ff637..ccc0c4e52 100644 --- a/config/config.exs +++ b/config/config.exs @@ -241,7 +241,7 @@ config :pleroma, :instance, mrf_transparency_exclusions: [], autofollowed_nicknames: [], max_pinned_statuses: 1, - no_attachment_links: true, + attachment_links: false, welcome_user_nickname: nil, welcome_message: nil, max_report_comment_size: 1000, diff --git a/config/description.exs b/config/description.exs index 661acd716..efea7c137 100644 --- a/config/description.exs +++ b/config/description.exs @@ -798,9 +798,9 @@ config :pleroma, :config_description, [ ] }, %{ - key: :no_attachment_links, + key: :attachment_links, type: :boolean, - description: "Enable to disable automatically adding attachment link text to statuses" + description: "Enable to automatically add attachment link text to statuses" }, %{ key: :welcome_message, |