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:
commit
a8ff985135
3 changed files with 15 additions and 3 deletions
3
.vscode/extensions.json
vendored
3
.vscode/extensions.json
vendored
|
@ -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
12
.vscode/settings.json
vendored
|
@ -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"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,5 +5,6 @@
|
||||||
],
|
],
|
||||||
"lockFileMaintenance": {
|
"lockFileMaintenance": {
|
||||||
"enabled": true
|
"enabled": true
|
||||||
}
|
},
|
||||||
|
"rebaseWhen": "conflicted"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue