Merge branch 'chore/remote-unused-option' into 'develop'

Remove unused noAttachmentLinks option See merge request pleroma/pleroma-fe!1109
2020-05-20 14:42:29 +00:00 · 2020-05-20 14:42:29 +00:00 · d53a4a754f
commit d53a4a754f
parent bc9ed36424 840c6f40b6
2 changed files with 0 additions and 2 deletions
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
  copyInstanceOption('subjectLineBehavior')
  copyInstanceOption('postContentType')
  copyInstanceOption('alwaysShowSubjectInput')
-  copyInstanceOption('noAttachmentLinks')
  copyInstanceOption('showFeaturesPanel')
  copyInstanceOption('hideSitename')

--- a/static/config.json
+++ b/static/config.json
@ -14,7 +14,6 @@
  "logoMargin": ".1em",
  "logoMask": true,
  "minimalScopesMode": false,
-  "noAttachmentLinks": false,
  "nsfwCensorImage": "",
  "postContentType": "text/plain",
  "redirectRootLogin": "/main/friends",