Commit Graph

1347 Commits (main)

Author SHA1 Message Date
Matt Jankowski 1564799952
Add spec coverage for media CLI `refresh` command (#28166) 6 months ago
Matt Jankowski 440b80b2e7
Model concerns organization into module namespaces (#28149) 6 months ago
Matt Jankowski b696ca6b1a
Move self destruct CLI command definition code to module (#28131) 6 months ago
Matt Jankowski a1636fce7f
Move lib/devise/* to lib/devise/strategies/* (#27638) 6 months ago
Matt Jankowski 31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636) 6 months ago
Matt Jankowski e892efbc40
Configure elastic search integration with rspec tag (#27882) 6 months ago
Eugen Rochko 0d14fcebae
Change link previews to keep original URL from the status (#27312) 6 months ago
Matt Jankowski c9204b792c
Fix `Rails/I18nLocaleTexts` cop (#27779) 6 months ago
Renaud Chaput 757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 (#27073) 6 months ago
Matt Jankowski 370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command (#25252) 6 months ago
Matt Jankowski 45770c9306
Fix `Performance/MapMethodChain` cop (#27744) 6 months ago
Matt Jankowski 2d39268bc5
Fix `Lint/OrAssignmentToConstant` cop (#27750) 6 months ago
Matt Jankowski 7ef56d6e50
Move json_ld context loaders to `config/initializers` (#27590) 7 months ago
Matt Jankowski 4aa05d45fc
Capture minimum postgres version 12 (#27528) 7 months ago
Claire 62620956d5 Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 7 months ago
Claire fa65c8244f
Fix cache store pool config deprecation warnings (#27551) 7 months ago
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
Conflicts and ported changes:
- updated `@rails/ujs` imports
7 months ago
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
7 months ago
Claire e6c3d3c744 Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream 7 months ago
Claire 57c0de949b Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
7 months ago
Matt Jankowski e93a75f1a1
Rails 7.1 update (#25963) 7 months ago
Claire 379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 7 months ago
Claire 79a63201a9
Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR (#27512) 7 months ago
Claire 44edf3aa91
Improve error handling in mastodon:setup task (#21464) 7 months ago
Claire 63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 7 months ago
Matt Jankowski 65cd0700e4
Refactor domains cli to remove model call from regex (#25878) 7 months ago
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
7 months ago
Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
7 months ago
Claire 19ebf7797e Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 7 months ago
Nick Schonning 8bb4706e11
Move migration_helpers Rubocop ignore to config (#24236) 8 months ago
Matt Jankowski 937dc42f10
Extract methods for file movement in `CLI::Upgrade` (#25120) 8 months ago
Claire f0c720cfc9
Bump version to v4.3.0-alpha.0 (#27022) 8 months ago
Claire abdb58840a Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 8 months ago
Claire 82eaa26d87
Update `tootctl maintenance fix-duplicates` to Mastodon v4.2.0 (#27147) 8 months ago
Claire 06444c86c7
Fix division by zero in video in bitrate computation code (#27129) 8 months ago
Claire 86ec1e833e Merge branch 'main' into glitch-soc/merge-upstream 8 months ago
Claire 4fcc026f0f
Bump version to v4.2.0 (#27017) 8 months ago
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
8 months ago
Claire 890e334703
Add migration tests for negative settings (#27012) 8 months ago
Claire 6a9e93ae19 Merge branch 'main' into glitch-soc/merge-upstream 8 months ago
Claire abcc0b38fa
Fix incorrect PostgreSQL version check (#26979) 8 months ago
Claire f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 8 months ago
Claire f4b780ba22
Bump version to v4.2.0-rc2 (#26974) 8 months ago
Claire 22ee4e057d Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
8 months ago
Eugen Rochko 0f3f9b611f
Change video bitrate to always fit within size limit (#26970) 8 months ago
Claire 5ed72f668f Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 8 months ago
Claire e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
8 months ago
Claire 08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 8 months ago
Claire 3ca94f6d4a Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream 8 months ago
Claire b90383d073
Bump version to v4.2.0-rc1 (#26916) 8 months ago
Jeong Arm 97f3d7b662
Fix Version metadata have trailing dot (#2403) 8 months ago
Jeong Arm 59af3c1310
Add PublicStatuses to tootctl search deploy --only option (#26896) 8 months ago
jsgoldstein 4d9186a48c
Add search tests (#26703) 8 months ago
Eugen Rochko 3a679844e4
Fix `account_id`, `max_id` and `min_id` params not working in search (#26847) 8 months ago
Claire ec48bc3610
Do not truncate backtrace when the `BACKTRACE` env variable is set (#26794) 9 months ago
Claire 87b5f84625 Merge commit 'f80f426c57d5a5e1d289372ef7c323741d27c768' into glitch-soc/merge-upstream 9 months ago
Claire f80f426c57
Bump version to v4.2.0-beta3 (#26753) 9 months ago
Claire e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 9 months ago
Claire cddef4c485
Fix language settings for users having selected the `kmr` language (#26787) 9 months ago
Claire c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 9 months ago
Claire fbbe9f1c12 Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream 9 months ago
Claire 3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
9 months ago
Claire 6b7c47311d Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 9 months ago
Claire 16681e0f20
Add admin notifications for new Mastodon versions (#26582) 9 months ago
Eugen Rochko 01b87a1632
Change video compression parameters (#26631) 9 months ago
Claire f39847476c
Change the pre-release versioning scheme and associated environment variables (#26653) 9 months ago
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
9 months ago
Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
9 months ago
Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
9 months ago
Claire 88ff45a3b2 Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream 9 months ago
Claire 1b5d3fdc5e Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 9 months ago
jsgoldstein 30c191aaa0
Add new public status index (#26344)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
Jaehong Kang 2dbbeedc94
Fix: Workaround to load MASTODON_VERSION_* in Docker. (#26591)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
yufushiro 3aac12981c
Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough (#26608)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
Claire 10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 9 months ago
Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
9 months ago
Nick Schonning b970ed6098
Update rubocop and rubocop-rspec (#26329) 9 months ago
Claire 7e25e311d5 Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream 9 months ago
Claire facfec1ba3
Bump version to v4.2.0-beta2 (#26579) 9 months ago
Claire e7bea8f004
Fix already initialized constant warning (#26542) 9 months ago
Renaud Chaput b95867ad1f
Allow setting a custom HTTP method in CacheBuster (#26528)
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
9 months ago
Claire dd049fc37a
Fix ES_PRESET not being applied to Chewy's internal index (#26489) 9 months ago
Claire 3a8370e1f4
Fix `repo:changelog` task matching strings that are not Pull Request identifiers (#26280) 9 months ago
Claire f5778caa3a
Add `ES_PRESET` option to customize numbers of shards and replicas (#26483)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
9 months ago
Claire 92df185be7 Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream 9 months ago
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
9 months ago
Jeong Arm 496eb6f7a4
Add missing instances option to tootctl search deploy (#26461) 9 months ago
Claire ea8802a05a Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 9 months ago
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
9 months ago
Claire dab54ccbba
Prepare v4.2.0-beta1 (#26339) 10 months ago
Eugen Rochko 0e2a4d3897
Fix adding column with default value taking longer on Postgres >= 11 (#26375) 10 months ago
Claire 6b896b20cc
Add primary key to preview_cards_statuses join table (includes deduplication migration) (#25243) 10 months ago
Claire 425d77f812
Fix crash in `tootctl status remove` and some old migrations (#26210) 10 months ago
Christian Schmidt f2257069b2
Fix AVIF attachments (#26264) 10 months ago
Claire 51768de16e
Bump version to v4.1.6 (#26272) 10 months ago
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
10 months ago
Claire b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 10 months ago
Claire 7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
10 months ago
Christian Schmidt d76f79f647
Remove obsolete backport from Rails 7 (#26254) 10 months ago
Matt Jankowski 30f5ec7303
Rubocop fix: `Perfomance/UnfreezeString` (#26217) 10 months ago
Renaud Chaput 4d1b67f664
Add end-to-end (system) tests (#25461) 10 months ago
Misty De Méo 12a6cf569e
Storage: add :azure to remaining callers (#26080) 10 months ago
Claire b4e739ff0f
Change interaction modal in web UI (#26075)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
10 months ago
Claire f2c683336b
Bump version to v4.1.5 (#26108) 10 months ago
Renaud Chaput 42698b4c5c
Fix the crossorigin attribute (#26096) 10 months ago
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.
10 months ago
Matt Jankowski f831452037
Refactor `Snowflake` to avoid brakeman sql injection warnings (#25879) 10 months ago
Matt Jankowski b8b2470cf8
Fix `Style/SlicingWithRange` cop (#25923) 10 months ago
Nick Schonning 1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment (#23793) 10 months ago
anna d6845d08d7
bump to nyastodon 1.2.2 10 months ago
anna b4e8f17031
bump to nyastodon 1.2.1 10 months ago
anna ddbdcaf0f8
bump to nyastodon 1.2.0 10 months ago
anna 0fbd6c586a
merge with catstodon/main 10 months ago
Jeremy Kescher 037fcd9d31
Merge branch 'glitch-soc' into develop 11 months ago
Claire b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
11 months ago
Claire 0051128387
Bump version to v4.1.4 (#25805) 11 months ago
Claire 71d44949bf
Fix branding:generate_app_icons failing because of disallowed ICO coder (#25794) 11 months ago
anna f3932cf879
bump to nyastodon 1.1.11 11 months ago
anna 6b7b0d5b15
merge with catcatnya/main 11 months ago
Local User 0527458f38 Merge branch 'upstream/main' into develop 11 months ago
Claire ff7aae3037 Merge branch 'main' into glitch-soc/merge-upstream 11 months ago
Claire 5e1752ce3f
Bump version to v4.1.3 (#25757) 11 months ago
Claire dc8f1fbd97
Merge pull request from GHSA-9928-3cp5-93fm
* Fix attachments getting processed despite failing content-type validation

* Add a restrictive ImageMagick security policy tailored for Mastodon

* Fix misdetection of MP3 files with large cover art

* Reject unprocessable audio/video files instead of keeping them unchanged
11 months ago
Claire 6d8e0fae3e
Merge pull request from GHSA-ccm4-vgcc-73hp
* Tighten allowed HTML in oEmbed-based preview cards

* Sanitize preview cards at render time

* Add `sandbox` attribute to preview card iframes
11 months ago
Claire fed9cbfd2b
Add hardened headers to user-uploaded files (#25756) 11 months ago
anna 47a672b898
bump to nyastodon 1.1.10 11 months ago
anna ea737d53d4
fix nyastodon version string 11 months ago
anna b4fa21bce4
merge catcatnya/main into main 11 months ago
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' 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.
11 months ago
Claire c78280a8ce
Add translate="no" to outgoing mentions and links (#25524) 11 months ago
Plastikmensch eba3411bfa
Re-allow title attribute in <abbr> (#2254)
* Re-allow title attribute in <abbr>

This was accidentally removed in 7623e18124

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add test

Add a new test to check that title attribute on <abbr> is kept.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
11 months ago
Claire 65cbcce997 Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 11 months ago
Matt Jankowski b5675e265e
Add coverage for `CLI::Feeds` command (#25319) 11 months ago
Matt Jankowski 07933db788
Add coverage for `CLI::Cache` command (#25238) 11 months ago
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
11 months ago
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.
11 months ago
Claire aa57f7e3e2 Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream 11 months ago
Nick Schonning c66250abf1
Autofix Rubocop Regex Style rules (#23690)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Claire c22fc2fa80 Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
12 months ago
Jed Fox 768b00c4d0
Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 12 months ago
Matt Jankowski cd4f0feab8
Extract verify options method in search cli (#25121) 12 months ago
Matt Jankowski 35c1c3e57a
Add CLI area progress bar helper (#25208) 12 months ago
Matt Jankowski dc26140d54
Use thor methods instead of tty prompt in maintenance cli (#25207) 12 months ago
Matt Jankowski 1baf40077b
Fix FormatStringToken cop in CLI (#25122) 12 months ago
Matt Jankowski 80c7de9984
Fix Rails/WhereExists cop in CLI (#25123) 12 months ago
Matt Jankowski b7b96efd17
Extract helper method for error report in cli/accounts command (#25119) 12 months ago
Matt Jankowski 2cecb2dc9e
Increment index which was previously not used in maintenance CLI loop (#25118) 12 months ago
Matt Jankowski ec9bc7e604
Consistent usage of CLI `dry_run?` method (#25116) 12 months ago
Claire 0669783da8 Merge branch 'main' into glitch-soc/merge-upstream 12 months ago
Claire 0e7466717f Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
12 months ago