mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did.
This commit is contained in:
@@ -64,7 +64,6 @@ module.exports = defineConfig({
|
||||
'indent': ['error', 2],
|
||||
'jsx-quotes': ['error', 'prefer-single'],
|
||||
'semi': ['error', 'always'],
|
||||
'no-case-declarations': 'off',
|
||||
'no-catch-shadow': 'error',
|
||||
'no-console': [
|
||||
'warn',
|
||||
|
||||
Reference in New Issue
Block a user