mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-30 21:13:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21582 commits 2 branches 270 tags 226 MiB
Commit graph

1907 commits

Author SHA1 Message Date
Renaud Chaput
a7253075d1
Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
Matt Jankowski
ce43ed144c
Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
Claire
9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' 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.
 2023-07-12 16:03:05 +02:00
Renaud Chaput
ecd8e0d612
Update Stylelint (#25819) 2023-07-12 12:31:23 +02:00
Eugen Rochko
ba06a2f104
Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
Matt Jankowski
50c2a03695
Rails 7 update (#24241) 2023-07-02 10:38:53 +02:00
Claire
d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
 2023-06-10 16:22:14 +02:00
Claire
734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' 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.
 2023-06-10 15:32:29 +02:00
Claire
aa57f7e3e2 Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
Claire
93c714417f Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
 2023-06-10 14:38:04 +02:00
Claire
85722a918d Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' 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.
 2023-06-10 12:38:33 +02:00
Claire
c22fc2fa80 Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
 2023-06-05 13:25:22 +02:00
Nick Schonning
aea67d448b
Cleanup old translationRunner (#25241) 2023-06-02 20:01:36 +02:00
Renaud Chaput
b0780cfeed
Fix /share and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
Claire
dac460f43f
Bump workbox from 6.6.1 to 7.0.0 (#25232) 2023-06-01 10:24:11 +02:00
dependabot[bot]
5a50983654
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>
 2023-06-01 09:41:44 +02:00
dependabot[bot]
b05bbd91d0
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>
 2023-06-01 09:41:03 +02:00
Nick Schonning
d39bce963f
Add fix/lint helper dev targets (#23561) 2023-06-01 02:25:13 +02:00
Renaud Chaput
44cd88adc4
Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
dependabot[bot]
82f6d4c418
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>
 2023-05-31 09:57:48 +02:00
dependabot[bot]
b86f3596ba
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>
 2023-05-31 09:51:35 +02:00
dependabot[bot]
e24adacea1
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>
 2023-05-31 09:42:14 +02:00
dependabot[bot]
e1d0343354
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>
 2023-05-31 09:39:35 +02:00
dependabot[bot]
0ed8164777
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>
 2023-05-31 09:36:43 +02:00
Renaud Chaput
98e5e011aa
Upgrade Workbox to 6.6.0 (#25197) 2023-05-31 09:29:16 +02:00
dependabot[bot]
89d6341c80
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>
 2023-05-31 09:27:21 +02:00
Renaud Chaput
c2ea0dc65f
Drop support for Node.js 14 (#25198) 2023-05-31 08:42:40 +02:00
dependabot[bot]
44eaa979d4
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>
 2023-05-30 09:58:55 +02:00
dependabot[bot]
4869384fa0
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>
 2023-05-30 09:43:20 +02:00
dependabot[bot]
66c1ad8be9
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>
 2023-05-30 09:40:22 +02:00
dependabot[bot]
5f1a03fdba
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>
 2023-05-30 09:38:42 +02:00
dependabot[bot]
6d41cdcc6a
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>
 2023-05-30 09:34:59 +02:00
dependabot[bot]
8ff2d61add
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>
 2023-05-30 09:33:21 +02:00
dependabot[bot]
37dc48c3a1
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>
 2023-05-30 09:28:39 +02:00
Claire
0e7466717f Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
 2023-05-28 16:41:14 +02:00
Claire
e2ab9d4dad Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Claire
45d7358100 Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream 2023-05-25 23:18:57 +02:00
Claire
2e02d03524 Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire
b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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.
 2023-05-25 20:43:25 +02:00
dependabot[bot]
391c089d0d
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>
 2023-05-24 12:38:08 +02:00
dependabot[bot]
2e3b1ef13e
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>
 2023-05-24 10:47:50 +02:00
Renaud Chaput
342daeb389
Update react-redux (#25110) 2023-05-24 10:23:17 +02:00
dependabot[bot]
5b332112fc
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>
 2023-05-23 09:47:59 +02:00
dependabot[bot]
c2cbe90a89
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>
 2023-05-23 09:44:14 +02:00
dependabot[bot]
9e59186f78
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>
 2023-05-23 09:34:31 +02:00
dependabot[bot]
c7cbded282
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>
 2023-05-23 09:27:55 +02:00
dependabot[bot]
7cfa6424f1
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>
 2023-05-23 09:25:20 +02:00
dependabot[bot]
16d3e76a71
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>
 2023-05-23 09:15:43 +02:00
Nick Schonning
520e00a3c1
Don't run Rubocop excluded files for lint-staged (#25090) 2023-05-23 08:58:40 +02:00
Renaud Chaput
8d6aea3326
Upgrade to React 18 (#24916) 2023-05-22 15:48:01 +02:00
Nick Schonning
7d805cfa90
Remove requestAnimationFrame test polyfill (#25056) 2023-05-22 12:45:29 +02:00
dependabot[bot]
27ec8f297d
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>
 2023-05-19 11:28:56 +02:00
dependabot[bot]
2ce0b666a1
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>
 2023-05-16 15:39:18 +02:00
dependabot[bot]
520462799f
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>
 2023-05-16 10:51:02 +02:00
dependabot[bot]
bbe4800b04
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>
 2023-05-16 10:45:53 +02:00
dependabot[bot]
4d6a8ee34a
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>
 2023-05-16 10:10:02 +02:00
Renaud Chaput
2e1c6e93ad
Bump mkdirp major version (#24978) 2023-05-15 09:40:24 +02:00
dependabot[bot]
713d217384
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>
 2023-05-14 15:09:33 +02:00
Renaud Chaput
5eeb40bdbe
Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00
Claire
facc7ab03c Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream 2023-05-09 23:37:38 +02:00
Claire
1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' 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.
 2023-05-09 23:12:48 +02:00
Claire
c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' 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.
 2023-05-09 22:12:05 +02:00
Nick Schonning
51b83ed195
Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
dependabot[bot]
72dcb2ef58
Bump @typescript-eslint/eslint-plugin from 5.59.2 to 5.59.5 (#24922) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-09 15:42:21 +02:00
dependabot[bot]
a5ba98d2df
Bump @typescript-eslint/parser from 5.59.2 to 5.59.5 (#24921) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-09 15:25:49 +02:00
Renaud Chaput
a3a2414f0e
Rework polyfills loading (#24907) 2023-05-09 14:55:35 +02:00
Renaud Chaput
aec486b4ec
Upgrade uuid to 9.0.0 (#24917) 2023-05-09 14:43:07 +02:00
Renaud Chaput
d9b93bd15e
Enforce React Rules of Hooks with eslint (#24911) 2023-05-09 03:09:11 +02:00
Renaud Chaput
955179fc55
Dont use CommonJS (require, module.exports) anywhere (#24913) 2023-05-09 03:08:47 +02:00
Claire
d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
 2023-05-08 19:28:21 +02:00
Claire
2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
 2023-05-08 15:28:36 +02:00
dependabot[bot]
64fae0efb5
Bump @babel/core from 7.21.5 to 7.21.8 (#24831) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-04 14:14:02 +02:00
dependabot[bot]
880e661d53
Bump stylelint from 15.6.0 to 15.6.1 (#24829) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-04 11:30:58 +02:00
dependabot[bot]
ff974395c2
Bump react-select from 5.7.2 to 5.7.3 (#24830) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-04 11:16:39 +02:00
dependabot[bot]
8d61d2b0da
Bump axios from 1.3.6 to 1.4.0 (#24775) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 21:04:37 +02:00
dependabot[bot]
8f7c172eb8
Bump @babel/preset-typescript from 7.21.4 to 7.21.5 (#24776) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 21:03:26 +02:00
dependabot[bot]
b0ebaeb691
Bump @babel/preset-env from 7.21.4 to 7.21.5 (#24773) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 20:50:41 +02:00
dependabot[bot]
1d49718a84
Bump @babel/runtime from 7.21.0 to 7.21.5 (#24771) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 20:46:45 +02:00
dependabot[bot]
14a7e414fc
Bump @babel/core from 7.21.4 to 7.21.5 (#24778) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 20:43:11 +02:00
fusagiko / takayamaki
8227af8dcc
use configureStore of redux-toolkit instead of createStore of redux (#24790) 2023-05-02 20:39:06 +02:00
dependabot[bot]
2839fbc733
Bump eslint-plugin-formatjs from 4.10.0 to 4.10.1 (#24770) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 20:35:13 +02:00
dependabot[bot]
4acf5f8971
Bump @typescript-eslint/eslint-plugin from 5.59.1 to 5.59.2 (#24768) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 20:24:48 +02:00
dependabot[bot]
4b87e2a8db
Bump @typescript-eslint/parser from 5.59.1 to 5.59.2 (#24774) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 20:06:13 +02:00
dependabot[bot]
b75c353962
Bump yargs from 17.7.1 to 17.7.2 (#24769) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 19:40:44 +02:00
dependabot[bot]
18f58f4284
Bump jsdom from 21.1.1 to 21.1.2 (#24767) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 18:40:34 +02:00
dependabot[bot]
389f0443c8
Bump cssnano from 6.0.0 to 6.0.1 (#24777) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-02 18:08:03 +02:00
Nick Schonning
fc56eda94b
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-05-01 18:23:57 +09:00
dependabot[bot]
0669822ae8
Bump eslint from 8.38.0 to 8.39.0 (#24636) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 16:01:11 +09:00
dependabot[bot]
242d7864f1
Bump @types/jest from 29.4.2 to 29.5.1 (#24630) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 16:00:48 +09:00
dependabot[bot]
56cf092058
Bump @types/yargs from 17.0.22 to 17.0.24 (#24388) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 15:46:03 +09:00
dependabot[bot]
819daeb651
Bump @types/lodash from 4.14.191 to 4.14.194 (#24576) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 15:39:49 +09:00
dependabot[bot]
921bef6799
Bump stylelint from 15.3.0 to 15.6.0 (#24635) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 15:38:53 +09:00
Nick Schonning
470b8abb69
Run Rubocop with lint-staged on commit (#24644) 2023-04-30 06:46:16 +02:00
Nick Schonning
f22b4e556c
Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
Claire
12b935fadf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
 2023-04-29 10:44:56 +02:00
dependabot[bot]
d9e9579832
Bump tesseract.js from 2.1.1 to 2.1.5 (#19084) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-27 11:26:13 +02:00
dependabot[bot]
b839babb39
Bump sass from 1.62.0 to 1.62.1 (#24668) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 17:43:52 +02:00
dependabot[bot]
785b0349eb
Bump lint-staged from 13.2.1 to 13.2.2 (#24669) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 17:43:37 +02:00
dependabot[bot]
872c4e1ef2
Bump glob from 10.0.0 to 10.2.2 (#24632) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 17:36:58 +02:00
dependabot[bot]
2f5608e9e5
Bump sass from 1.61.0 to 1.62.0 (#24574) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 16:30:43 +02:00
dependabot[bot]
5f624954be
Bump @typescript-eslint/eslint-plugin from 5.59.0 to 5.59.1 (#24633) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 23:10:54 +09:00
dependabot[bot]
9650a5738a
Bump @typescript-eslint/parser from 5.59.0 to 5.59.1 (#24638) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 22:35:24 +09:00
Nick Schonning
dcdc614bd2
Remove postcss-scss devDep (#24223) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-26 22:33:31 +09:00
dependabot[bot]
1820b55a11
Bump postcss from 8.4.22 to 8.4.23 (#24629) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 14:41:20 +02:00
dependabot[bot]
0c66358601
Bump prettier from 2.8.7 to 2.8.8 (#24631) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 14:41:09 +02:00
dependabot[bot]
fba60094a2
Bump axios from 1.3.5 to 1.3.6 (#24640) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-26 14:34:16 +02:00
Emelia Smith
301e03eb8c
Remove clustering from streaming API (#24655) 2023-04-26 11:37:51 +02:00
dependabot[bot]
0c81eec239
Bump @typescript-eslint/eslint-plugin from 5.58.0 to 5.59.0 (#24573) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-24 11:24:06 +09:00
dependabot[bot]
03ea084f0d
Bump @typescript-eslint/parser from 5.58.0 to 5.59.0 (#24568) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-24 10:54:07 +09:00
Nick Schonning
0c7ce98ff6
Add eslint-plugin-formatjs (#23976) 2023-04-23 22:46:13 +02:00
Claire
abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
 2023-04-22 10:06:11 +02:00
dependabot[bot]
426e3cc3bc
Bump reselect from 4.1.7 to 4.1.8 (#24565) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-18 10:12:05 +02:00
dependabot[bot]
fe1ac6b0b0
Bump postcss from 8.4.21 to 8.4.22 (#24570) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-18 10:11:53 +02:00
dependabot[bot]
a5e9128b74
Bump http-link-header from 1.1.0 to 1.1.1 (#24575) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-18 10:09:38 +02:00
Claire
f9a9f9344b Merge branch 'main' into glitch-soc/merge-upstream 2023-04-16 17:52:44 +02:00
dependabot[bot]
ce50f04f0a
Bump glob from 9.3.4 to 10.0.0 (#24490) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 16:02:19 +02:00
dependabot[bot]
458e49c40c
Bump @typescript-eslint/eslint-plugin from 5.55.0 to 5.58.0 (#24488) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 15:39:08 +02:00
dependabot[bot]
8ffa11740f
Bump @typescript-eslint/parser from 5.55.0 to 5.58.0 (#24494) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 15:25:55 +02:00
dependabot[bot]
0765aeba38
Bump eslint from 8.36.0 to 8.38.0 (#24493) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 15:03:44 +02:00
dependabot[bot]
fe841b6bb6
Bump sass from 1.60.0 to 1.61.0 (#24487) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 13:43:54 +02:00
dependabot[bot]
b6e353fde1
Bump rimraf from 4.4.1 to 5.0.0 (#24492) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 12:15:53 +02:00
dependabot[bot]
ccd74ecd10
Bump @babel/plugin-transform-runtime from 7.21.0 to 7.21.4 (#24394) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 12:11:13 +02:00
dependabot[bot]
b178fd3f92
Bump @babel/preset-env from 7.20.2 to 7.21.4 (#24382) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 12:04:40 +02:00
dependabot[bot]
7d7cfeaa06
Bump @babel/preset-typescript from 7.21.0 to 7.21.4 (#24396) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 11:54:16 +02:00
dependabot[bot]
999d992c10
Bump @babel/core from 7.21.3 to 7.21.4 (#24386) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 11:47:10 +02:00
dependabot[bot]
3c7053a2db
Bump axios from 1.3.4 to 1.3.5 (#24485) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 10:57:57 +02:00
dependabot[bot]
881326ff61
Bump typescript from 5.0.3 to 5.0.4 (#24489) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 10:57:41 +02:00
dependabot[bot]
08d318909c
Bump lint-staged from 13.2.0 to 13.2.1 (#24491) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-11 10:57:08 +02:00
Claire
ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
 2023-04-09 11:45:08 +02:00
Nick Schonning
c0886dee14
Remove Array.prototype.includes polyfill (#24234) 2023-04-07 13:03:42 +02:00
dependabot[bot]
0358abe73a
Bump typescript from 4.9.5 to 5.0.3 (#24398) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-04 15:05:12 +02:00
Claire
d13ef49b15 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-04 12:45:12 +02:00
dependabot[bot]
a8cd1b1238
Bump glob from 9.3.2 to 9.3.4 (#24383) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-04 11:25:25 +02:00
Nick Schonning
8e19c44b2c
Align typings with installed versions (#24410) 2023-04-04 10:48:26 +02:00
Claire
4d5b4dacd6 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00
Claire
5d67fc09c3
Clean up JS dependencies (#24377) 2023-04-03 15:06:29 +02:00
Nick Schonning
373e4a8ff0
Move ESLint configs to overrides (#24370) 2023-04-03 12:41:10 +02:00
Renaud Chaput
be230be734
Fix build issues caused by #16210 (#24374) 2023-04-03 12:31:34 +02:00
fusagiko / takayamaki
4520e6473a
[Proposal] Make able to write React in Typescript (#16210) 
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
 2023-04-03 03:31:39 +02:00
Claire
4aaa1772b6 Restore exif-js dependency 2023-03-31 22:50:57 +02:00
Claire
01d6f7529f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.
 2023-03-31 21:30:27 +02:00
dependabot[bot]
67450cf002
Bump cssnano from 5.1.15 to 6.0.0 (#24296) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-30 10:38:00 +02:00
dependabot[bot]
c855e1ecbc
Bump sass from 1.59.3 to 1.60.0 (#24292) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 11:27:14 +02:00
dependabot[bot]
550d40a361
Bump rimraf from 4.4.0 to 4.4.1 (#24291) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 11:11:50 +02:00
dependabot[bot]
ef52da6dc7
Bump react-textarea-autosize from 8.4.0 to 8.4.1 (#24293) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 11:03:38 +02:00
dependabot[bot]
c384795731
Bump react-select from 5.7.1 to 5.7.2 (#24294) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:37:33 +02:00
dependabot[bot]
674f9b5966
Bump prettier from 2.8.5 to 2.8.7 (#24295) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:35:27 +02:00
dependabot[bot]
657236546f
Bump mkdirp from 2.1.5 to 2.1.6 (#24297) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:34:49 +02:00
dependabot[bot]
4f16e4dbde
Bump glob from 9.3.0 to 9.3.2 (#24298) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-29 10:34:27 +02:00