mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,806 Commits
69 Branches
22 Tags
344 MiB
Commit Graph

2772 Commits (f441e3db4e384e047f06e62979ea4fd2099fcef0)

Author SHA1 Message Date
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
renovate[bot] 72f623c391
Update dependency @dnd-kit/sortable to v9 (#33051) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-26 07:26:47 +00:00
renovate[bot] 7fb0880e1e
Update dependency husky to v9.1.7 (#33058) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-25 08:17:52 +00:00
Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-11-24 16:46:28 +01:00
renovate[bot] 49a12a2df9
Update dependency @formatjs/cli to v6.3.11 (#32950) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-18 08:57:37 +00:00
Claire 4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
renovate[bot] 44d92fa4f6
Update dependency uuid to v11.0.3 (#32913) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-15 16:15:44 +00:00
renovate[bot] 54a7c1898e
Update dependency uuid to v11 (#32676) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-15 15:55:10 +00:00
renovate[bot] 7fc8292ea5
Update dependency react-textarea-autosize to v8.5.5 (#32872) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-13 15:08:10 +00:00
renovate[bot] 1f85ca2b0e
Update dependency react-select to v5.8.3 (#32817) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-12 08:35:31 +00:00
renovate[bot] 88512220bb
Update dependency @formatjs/cli to v6.3.8 (#32830) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-12 08:33:23 +00:00
renovate[bot] 90b5017c19
Update dependency postcss to v8.4.49 (#32831) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-12 08:33:02 +00:00
renovate[bot] 67a2b03909
Update dependency postcss-preset-env to v10.1.0 (#32835) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-12 08:32:43 +00:00
Claire f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
renovate[bot] 883b509988
Update dependency postcss-preset-env to v10.0.9 (#32746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-05 08:36:03 +00:00
renovate[bot] 823f597f00
Update formatjs monorepo (#32764) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-04 09:20:13 +00:00
renovate[bot] 074fb04c6a
Update dependency utf-8-validate to v6.0.5 (#32738) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-04 08:42:39 +00:00
renovate[bot] f2763d978c
Update formatjs monorepo (#32751) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-04 08:38:46 +00:00
renovate[bot] 1657106473
Update DefinitelyTyped types (non-major) (#32760) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-04 08:38:32 +00:00
renovate[bot] dfdc6b2871
Update devDependencies (non-major) (#32761) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-04 08:38:20 +00:00
Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
renovate[bot] b3b3c0fe96
Update dependency core-js to v3.39.0 (#32707) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-31 10:28:20 +00:00
renovate[bot] 110aa0aa28
Update workbox monorepo to v7.3.0 (#32691) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-30 09:09:10 +00:00
renovate[bot] cff1846f80
Update babel monorepo to v7.26.0 (#32659) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-28 14:55:45 +00:00
renovate[bot] 6a5a59c28c
Update dependency @formatjs/cli to v6.3.5 (#32675) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-28 13:21:24 +00:00
renovate[bot] c3919289d2
Update DefinitelyTyped types (non-major) (#32674) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-28 13:21:01 +00:00
renovate[bot] 48f6f46072
Update dependency react-select to v5.8.2 (#32661) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-28 13:20:47 +00:00
Matt Jankowski d547bf2f1e
Update rails to version 7.1.4.2 (#32670) 2024-10-28 07:37:32 +00:00
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
renovate[bot] 3aa38841bd
Update formatjs monorepo (#32651) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:36:14 +00:00
renovate[bot] aa29e42cf8
Update babel monorepo to v7.25.9 (#32628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:17:41 +00:00
renovate[bot] 60b0ad0771
Update dependency postcss-preset-env to v10.0.8 (#32647) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:17:22 +00:00
renovate[bot] 097942a291
Update dependency pg to v8.13.1 (#32650) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:15:22 +00:00
renovate[bot] f8a66e9915
Update formatjs monorepo (#32612) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-22 08:36:32 +00:00
renovate[bot] bb05325306
Update dependency eslint-plugin-formatjs to v5 (#32087) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:37:51 +00:00
renovate[bot] 699f75bb35
Update dependency eslint-plugin-react-hooks to v5 (#32425) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:23:46 +00:00
renovate[bot] bd850d1ec0
Update dependency @reduxjs/toolkit to v2.3.0 (#32497) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:22:07 +00:00
renovate[bot] e05f9fed33
Update dependency pino to v9.5.0 (#32511) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:04:30 +00:00
renovate[bot] 11a63b2db6
Update eslint (non-major) (#32279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-10-21 08:03:44 +00:00
renovate[bot] 35da47c857
Update devDependencies (non-major) (#32603) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 07:28:35 +00:00
renovate[bot] a19a120769
Update DefinitelyTyped types (non-major) (#32278) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 07:27:27 +00:00
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
Matt Jankowski a0c7b317a7
Update rails to version 7.1.4.1 (#32542) 2024-10-16 12:52:06 +00:00
renovate[bot] 92c8860451
Update babel monorepo to v7.25.8 (#32391) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-15 13:58:33 +00:00
renovate[bot] c772b41c36
Update dependency react-textarea-autosize to v8.5.4 (#32401) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-15 13:38:48 +00:00
renovate[bot] c19397b94a
Update formatjs monorepo (#32304) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-15 13:38:02 +00:00
Claire 4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00