f55959ebd9
Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
1 year ago
ecfcdbbd6f
Update dependency sass to v1.64.1 ( #26146 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
d268a0cdcf
Update dependency postcss to v8.4.27 ( #26144 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
cb70bb8665
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
1 year ago
877ea733b2
Update dependency react-select to v5.7.4 ( #26033 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
0ef1efbe71
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
42f670c82d
Update dependency postcss to v8.4.26 ( #26030 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
20537e068f
Update dependency immutable to v4.3.1 ( #26029 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
0d0f6bc223
Update babel monorepo to v7.22.9 ( #26017 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
1 year ago
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
1 year ago
c6212d89f8
Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
1 year ago
725b27379e
Update dependency postcss to v8.4.25 ( #25961 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
7ca72cab0e
Update dependency react-textarea-autosize to v8.5.2 ( #25962 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
a09ed92a77
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
1 year ago
9e6c02fd81
Update dependency glob to v10.3.3 ( #25959 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
31519eee55
Update dependency core-js to v3.31.1 ( #25958 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
5cdc196e44
Rails 7.0 update ( #25668 )
1 year ago
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
1 year ago
9af6f6db1a
Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
1 year ago
8d20afe0aa
Update Stylelint ( #25819 )
1 year ago
5ad5dcd563
Update babel monorepo ( #25930 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
edb6aab974
Revert "Rails 7 update" ( #25667 )
1 year ago
5cadbaa296
Rails 7 update ( #24241 )
1 year ago
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
5e18962962
Update dependency glob to v10.3.0 ( #25608 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
51af55a38d
Update dependency pg to v8.11.1 ( #25604 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
338334e21a
Update dependency pg-connection-string to v2.6.1 ( #25605 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
f7ba6af02c
Update dependency react-textarea-autosize to v8.5.0 ( #25610 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
9123a25a84
Update dependency sass to v1.63.6 ( #25607 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
ee350f0491
Update dependency react-redux to v8.1.1 ( #25432 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
1 year ago
4564d41358
Update dependency dotenv to v16.2.0 ( #25506 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
1 year ago
1dc2b1459d
Lock file maintenance ( #25434 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
f370bdc45e
Update dependency intl-messageformat to v10.5.0 ( #25431 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
37326f3117
Update dependency core-js to v3.31.0 ( #25430 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
2f57cdadcf
Update devDependencies (non-major) ( #25427 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
dc31ba1a28
Update dependency sass to v1.63.3 ( #25422 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
4ceaee0da5
Update formatjs monorepo ( #25418 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
2d07bde935
Update dependency glob to v10.2.7 ( #25417 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
d8ef35d088
Update babel monorepo to v7.22.5 ( #25405 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
c22b032483
Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
1 year ago
c5e025a202
Update dependency webpack-bundle-analyzer to v4.9.0 ( #25327 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
5b2ff76a79
Update dependency dotenv to v16.1.3 ( #25302 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
b1f8013267
Update dependency sass-loader to v10.4.1 ( #25315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
26db476771
Update dependency redis to v4.6.7 ( #25300 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
8390f2c863
Update dependency react-redux to v8.0.7 ( #25298 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
29851c83bd
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
f30caffb80
Update yarn.lock for audit issues ( #25152 )
1 year ago
bf3227b5dd
Bump workbox from 6.6.1 to 7.0.0 ( #25232 )
1 year ago
dade894b82
Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 ( #25222 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
083e8715ef
Bump @types/jest from 29.5.1 to 29.5.2 ( #25220 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
76960f128a
Upgrade react-intl ( #24906 )
1 year ago
146e123a3c
Bump @babel/core and @types/babel__core ( #25183 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
e6b6217534
Bump @babel/plugin-transform-runtime from 7.21.4 to 7.22.4 ( #25173 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
28b9bf054e
Bump @babel/preset-react from 7.18.6 to 7.22.3 ( #25171 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
4ac0377394
Bump @babel/runtime from 7.21.5 to 7.22.3 ( #25170 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
58c565ae55
Bump @babel/preset-env from 7.21.5 to 7.22.4 ( #25167 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
8b69a60257
Upgrade Workbox to 6.6.0 ( #25197 )
1 year ago
9ba1135000
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
3a71f78b1d
Bump @types/react from 18.2.6 to 18.2.7 ( #25166 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
9f982d4e27
Bump jsdom from 22.0.0 to 22.1.0 ( #25178 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
85bc8d5da7
Bump @types/react-motion from 0.0.33 to 0.0.34 ( #25185 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
c4054d75e1
Bump @typescript-eslint/parser from 5.59.7 to 5.59.8 ( #25175 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
d7f607d506
Bump @typescript-eslint/eslint-plugin from 5.59.7 to 5.59.8 ( #25182 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
210edaea50
Bump @types/lodash from 4.14.194 to 4.14.195 ( #25184 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
2b709d80a3
Bump postcss from 8.4.23 to 8.4.24 ( #25169 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
973743ff50
Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
1 year ago
3413fc7002
Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream
1 year ago
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
1 year ago
11368da545
Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
1 year ago
b6c687abc2
Bump eslint from 8.40.0 to 8.41.0 ( #25081 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
0ce5706b48
Bump eslint-plugin-jsdoc from 44.2.4 to 44.2.5 ( #25112 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
432a937a9d
Update `react-redux` ( #25110 )
2 years ago
530151f6c8
Bump stylelint from 15.6.1 to 15.6.2 ( #25078 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
361e7ccf88
Bump rimraf from 5.0.0 to 5.0.1 ( #25082 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
580f35827f
Bump glob from 10.2.2 to 10.2.6 ( #25083 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
167b319cef
Bump webpack-merge from 5.8.0 to 5.9.0 ( #25084 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
1f88c425df
Bump @typescript-eslint/eslint-plugin from 5.59.6 to 5.59.7 ( #25085 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
e27d9a9130
Bump @typescript-eslint/parser from 5.59.6 to 5.59.7 ( #25080 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
ab029328cf
Upgrade to React 18 ( #24916 )
2 years ago
9a02b3b350
Remove requestAnimationFrame test polyfill ( #25056 )
2 years ago
69a440cba1
Bump jsdom from 21.1.2 to 22.0.0 ( #24828 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
afb74b97b2
Bump pg-connection-string from 2.5.0 to 2.6.0 ( #24999 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
46c90ce2a5
Bump @typescript-eslint/eslint-plugin from 5.59.5 to 5.59.6 ( #24998 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
097d4dded1
Bump @typescript-eslint/parser from 5.59.5 to 5.59.6 ( #25000 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
1e31cc01b8
Bump eslint-plugin-jsdoc from 43.1.1 to 44.2.4 ( #24994 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
dae330bf32
Bump `mkdirp` major version ( #24978 )
2 years ago
68d5c67b9c
Bump eslint from 8.39.0 to 8.40.0 ( #24919 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
6a3211876c
Add stricter ESLint rules for Typescript files ( #24926 )
2 years ago
710151baf4
Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream
2 years ago
7f078e41c0
Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We deleted it.
Kept it removed.
- `app/javascript/packs/public.jsx`:
Upstream changed an import, we have slightly different ones.
Ported upstream changes.
2 years ago
5c4a012ac5
Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
2 years ago
Claire
renovate[bot]
Renaud Chaput
Matt Jankowski
Eugen Rochko
Nick Schonning
dependabot[bot]