mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2025-01-19 00:24:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24236 commits 5 branches 150 tags 287 MiB
Commit graph

2818 commits

Author SHA1 Message Date
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
renovate[bot]
bfe73e153d
Update dependency postcss to v8.5.1 (#33586) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-14 16:34:26 +00:00
renovate[bot]
6356870dae
Update dependency sass to v1.83.4 (#33585) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-14 14:14:03 +00:00
renovate[bot]
7b608b41f2
Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.6 (#33584) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-14 14:13:58 +00:00
renovate[bot]
44d9dc4bb0
Update dependency pino-http to v10.4.0 (#33560) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-13 08:51:46 +00:00
renovate[bot]
f3f6b65db4
Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.5 (#33553) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-13 08:47:43 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
renovate[bot]
e0f6292492
Update dependency uuid to v11.0.5 (#33538) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-10 09:12:45 +00:00
renovate[bot]
d155763014
Update dependency react-textarea-autosize to v8.5.7 (#33542) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-10 09:10:58 +00:00
renovate[bot]
51a92427ce
Update dependency react-intl to v7 (#32954) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-09 10:04:14 +00:00
renovate[bot]
b0fbb71759
Update dependency jsdom to v26 (#33521) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-09 09:55:34 +00:00
renovate[bot]
3c7f3b190c
Update formatjs monorepo (#32774) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-08 16:53:12 +00:00
renovate[bot]
d34e9eaf17
Update dependency @reduxjs/toolkit to v2.5.0 (#33102) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-08 14:02:07 +00:00
renovate[bot]
6a351e2247
Update dependency core-js to v3.40.0 (#33504) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-08 10:57:40 +00:00
renovate[bot]
8233293429
Update DefinitelyTyped types (non-major) (#33220) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-01-07 09:28:06 +00:00
Claire
126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
renovate[bot]
c0f5705c34
Update dependency uuid to v11.0.4 (#33464) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-06 08:01:22 +00:00
renovate[bot]
081244f692
Update dependency sass to v1.83.1 (#33453) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-06 07:55:37 +00:00
Claire
68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
renovate[bot]
098dd91523
Update dependency typescript to v5.7.2 (#33059) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-03 11:16:44 +00:00
Claire
cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
renovate[bot]
7b5adb0d64
Update dependency pino to v9.6.0 (#33386) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 09:03:56 +00:00
renovate[bot]
7c50e53baa
Update dependency bufferutil to v4.0.9 (#33414) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 08:37:51 +00:00
renovate[bot]
79cfffda3b
Update dependency postcss-preset-env to v10.1.3 (#33415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 08:36:40 +00:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
renovate[bot]
b01e8f4a9b
Update dependency ioredis to v5.4.2 (#33375) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-20 15:35:36 +00:00
renovate[bot]
fd0793dd0e
Update dependency postcss-preset-env to v10.1.2 (#33303) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-16 07:47:32 +00:00
renovate[bot]
02e78a7dac
Update devDependencies (non-major) (#33316) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-16 07:37:09 +00:00
Matt Jankowski
a8edc82471
Replace deprecated "github" format for stylelint on CI runs (#33292) 2024-12-14 09:50:08 +00:00
renovate[bot]
ed33064e7b
Update dependency sass to v1.83.0 (#33299) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-13 09:17:26 +00:00
renovate[bot]
6445facb8c
Update dependency react-select to v5.9.0 (#33279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-12 08:08:59 +00:00
renovate[bot]
32e23ef630
Update dependency react-redux to v9.2.0 (#33260) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-11 08:17:47 +00:00
renovate[bot]
5e4ca0881e
Update dependency @rails/ujs to v7.1.501 (#33258) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-11 07:55:14 +00:00
renovate[bot]
2e35b15b4d
Update dependency react-textarea-autosize to v8.5.6 (#33228) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-09 15:12:31 +00:00
renovate[bot]
7b7a29867b
Update devDependencies (non-major) (#33221) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-09 10:24:10 +00:00
renovate[bot]
96498a09c2
Update dependency @babel/preset-react to v7.26.3 (#33174) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-06 15:21:12 +00:00
renovate[bot]
3ad45ced5e
Update dependency @dnd-kit/core to v6.3.1 (#33194) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-06 15:20:36 +00:00
renovate[bot]
e35655cf55
Update dependency express to v4.21.2 (#33195) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-06 15:20:19 +00:00
renovate[bot]
d58173e45b
Update dependency @dnd-kit/sortable to v10 (#33183) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-05 09:12:21 +00:00
renovate[bot]
3708039856
Update dependency @dnd-kit/core to v6.3.0 (#33181) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-05 09:12:08 +00:00
renovate[bot]
b9b26490e7
Update dependency sass to v1.82.0 (#32411) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-04 10:40:47 +00:00
renovate[bot]
23a2366090
Update dependency dotenv to v16.4.7 (#33147) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-04 10:20:50 +00:00
renovate[bot]
1cb303ca75
Update dependency axios to v1.7.9 (#33168) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-04 09:12:26 +00:00
renovate[bot]
30c2a6c01c
Update dependency @rails/ujs to v7.1.500 (#32648) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-03 15:53:36 +00:00
Claire
c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
 2024-12-02 21:08:15 +01:00
renovate[bot]
462e0717d6
Update devDependencies (non-major) (#33126) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-02 08:11:22 +00:00
Claire
48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
  Minor conflict due to glitch-soc's theming system.
 2024-12-01 17:36:49 +01:00
renovate[bot]
f0855fd41f
Update dependency axios to v1.7.8 (#33075) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-26 08:10:19 +00:00
renovate[bot]
08914516d9
Update dependency postcss-preset-env to v10.1.1 (#32947) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-26 08:09:34 +00:00
renovate[bot]
b702cd74f3
Update dependency @dnd-kit/core to v6.2.0 (#33050) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-26 07:26:50 +00:00