Merge branch 'schema' into 'develop'

vscode autocompletion improvements, make renovate not rebase so often

See merge request soapbox-pub/soapbox!2096
This commit is contained in:
Alex Gleason 2022-12-30 17:56:31 +00:00
commit a8ff985135
3 changed files with 15 additions and 3 deletions

View file

@ -3,6 +3,7 @@
"dbaeumer.vscode-eslint", "dbaeumer.vscode-eslint",
"bradlc.vscode-tailwindcss", "bradlc.vscode-tailwindcss",
"stylelint.vscode-stylelint", "stylelint.vscode-stylelint",
"wix.vscode-import-cost" "wix.vscode-import-cost",
"redhat.vscode-yaml"
] ]
} }

12
.vscode/settings.json vendored
View file

@ -5,5 +5,15 @@
"*.conf.template": "properties" "*.conf.template": "properties"
}, },
"files.eol": "\n", "files.eol": "\n",
"files.insertFinalNewline": false "files.insertFinalNewline": false,
"json.schemas": [
{
"fileMatch": [".lintstagedrc.json"],
"url": "https://json.schemastore.org/lintstagedrc.schema.json"
},
{
"fileMatch": ["renovate.json"],
"url": "https://docs.renovatebot.com/renovate-schema.json"
}
]
} }

View file

@ -5,5 +5,6 @@
], ],
"lockFileMaintenance": { "lockFileMaintenance": {
"enabled": true "enabled": true
} },
"rebaseWhen": "conflicted"
} }