Commit Graph

21293 Commits

Author SHA1 Message Date
Claire 10a0d76bf0 Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different handling for
  the character limit.
  Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different limits for
  option length and number of options.
  Ported glitch-soc's changes to the new version.

Additional change:
- `app/javascript/styles/components.scss`:
  Change how the new image is looked up.
2024-02-22 20:58:41 +01:00
Claire f25414014a Fix link verifications when page size exceeds 1MB (#29358) 2024-02-22 20:45:40 +01:00
Claire b0822ae9cd Fix auto-close email being sent to users with devops permissions instead of settings permissions (#29355) 2024-02-22 20:45:40 +01:00
Claire d23f445527 Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-22 20:45:40 +01:00
Wojciech Maj d908ed8e86 Remove unused dependencies (#29289) 2024-02-22 20:45:40 +01:00
renovate[bot] 3dae23816b Update dependency haml_lint to v0.57.0 (#29181)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
renovate[bot] d10848946c Update dependency rails to v7.1.3.2 (#29342)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
renovate[bot] fec49022ed Update dependency selenium-webdriver to v4.18.1 (#29287)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
renovate[bot] 840ce1e0cb Update dependency webmock to v3.21.2 (#29290)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
renovate[bot] 7cd5866ddc Update dependency doorkeeper to v5.6.9 (#29196)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
Claire fff378177e
Further reduce differences with upstream (mainly private mention styling) (#2641)
* Use upstream's CSS for private mentions styling

* Further reduce differences with upstream
2024-02-22 18:45:54 +01:00
Claire 5152dd869e
Fix link verifications when page size exceeds 1MB (#29358) 2024-02-22 17:31:50 +00:00
Claire a9496882fc
Fix auto-close email being sent to users with devops permissions instead of settings permissions (#29355) 2024-02-22 14:52:14 +00:00
Claire b71904816a
Change registrations to be disabled by default for new servers (#29280) 2024-02-22 13:28:19 +00:00
Emelia Smith 491dd97642
Streaming: refactor to custom Error classes (#28632)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-22 13:20:20 +00:00
renovate[bot] ebe2086087
Update dependency haml_lint to v0.57.0 (#29181)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 11:26:48 +00:00
Matt Jankowski e9b0f0c314
Add basic coverage for `RemoveDomainsFromFollowersService` class (#29327) 2024-02-22 10:53:38 +00:00
Matt Jankowski 7c7dfe7de3
Add basic coverage for `RemoveFeaturedTagService` class (#29328) 2024-02-22 10:51:04 +00:00
Matt Jankowski 6342ddd698
Add basic coverage for `UnfavouriteService` class (#29329) 2024-02-22 10:48:42 +00:00
Matt Jankowski f70905f127
Add basic coverage for `UnmuteService` class (#29330) 2024-02-22 10:48:09 +00:00
Matt Jankowski a69fe534e3
Add basic coverage for `WebhookService` class (#29331) 2024-02-22 10:46:20 +00:00
Matt Jankowski d1602c017d
Add basic coverage for `ApproveAppealService` class (#29333) 2024-02-22 10:40:07 +00:00
Matt Jankowski ab2ef63a03
Add basic coverage for `VoteService` class (#29334) 2024-02-22 10:39:18 +00:00
renovate[bot] fa1c3a0915
Update dependency rack to v2.2.8.1 (#29341)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 10:37:54 +00:00
renovate[bot] 96d5c44db2
Update dependency rails to v7.1.3.2 (#29342)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 10:37:52 +00:00
github-actions[bot] 449fcf1ae7
New Crowdin Translations (automated) (#29343)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-22 10:37:48 +00:00
renovate[bot] 53a4648db1
Update dependency pino to v8.19.0 (#29253)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 09:03:13 +00:00
Matt Jankowski 006aa4e35a
Update husky and remove deprecated features (#29338) 2024-02-22 09:02:15 +00:00
renovate[bot] c63567a214
Update typescript-eslint monorepo to v7 (major) (#29179)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 22:06:17 +00:00
renovate[bot] 638861b2a3
Update dependency http-link-header to v1.1.2 (#29340)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:31:09 +00:00
renovate[bot] aed60df80e
Update dependency sass to v1.71.1 (#29238)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:29:41 +00:00
renovate[bot] bcc0860100
Update dependency core-js to v3.36.0 (#29197)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:28:53 +00:00
renovate[bot] df4ed60331
Update dependency dotenv to v16.4.5 (#29190)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:28:10 +00:00
renovate[bot] 38d0292281
Update dependency @reduxjs/toolkit to v2.2.1 (#29178)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:27:28 +00:00
renovate[bot] d48d824d9a
Update DefinitelyTyped types (non-major) (#29165)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:27:00 +00:00
Matt Jankowski 581f14e56f
Update yarn to version 4.1.0 (#29339) 2024-02-21 21:18:01 +00:00
Claire 604c93332f
Fix pillbar button colors (#2639) 2024-02-21 19:30:54 +01:00
Claire 2751acb6cd
Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-21 17:45:06 +00:00
Matt Jankowski 08342ad40c
Add basic coverage for `AfterUnallowDomainService` class (#29324) 2024-02-21 17:13:11 +00:00
Matt Jankowski 8f61e32569
Add basic coverage for `AppealService` class (#29322) 2024-02-21 17:12:31 +00:00
Matt Jankowski b73932461f
Add basic coverage for `CreateFeaturedTagService` class (#29321) 2024-02-21 16:58:19 +00:00
Matt Jankowski 5f19e7e799
Add basic coverage for `ProcessHashtagsService` class (#29320) 2024-02-21 16:57:45 +00:00
Claire 154a3119fb
Further reduce CSS differences with upstream (#2638) 2024-02-21 17:50:41 +01:00
Matt Jankowski 1f648fdf1a
Remove erroneous service type on `TagFeed` model spec (#29302) 2024-02-21 11:25:33 +00:00
github-actions[bot] fd2b6c29c6
New Crowdin Translations (automated) (#29311)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-21 11:24:44 +00:00
Claire bf6e57b420
Further reduce CSS and markup differences with upstream (#2637)
* Reduce differences in `MovedNote` markup and styling

* Remove unused setting toggle meta text support

* Fix various CSS discrepancies with upstream

* Further reduce differences with upstream
2024-02-20 23:06:17 +01:00
Emelia Smith 4ad7fadb82
Fix logging error in streaming server (#2636)
Logger changed upstream causing `log.silly` to error and crash the server for local only statuses
2024-02-20 20:19:58 +01:00
Claire 5f50b634cf
Further reduce CSS and markup differences with upstream (#2635)
* Further reduce CSS differences with upstream

* Reduce differences in markup and CSS with upstream

* Redo collapsible post notifications

* Reduce CSS differences further

* Reduce differences with upstream regarding `.status` and `.status__wrapper`

* Further reduce differences with upstream

* Reduce differences with upstream in DisplayName
2024-02-20 18:49:59 +01:00
Wojciech Maj 36fd47ac57
Remove unused dependencies (#29289) 2024-02-20 10:10:58 +00:00
Matt Jankowski 937dad1ee6
Extract ES query and filter hashes into private methods in `TagSearchService` (#29288) 2024-02-20 10:08:32 +00:00