Jeremy Kescher
3fc4a1a03f
README: Clarify stable-develop branches' purpose
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-01 17:18:13 +01:00
Jeremy Kescher
7fa9c34dee
Merge branch 'upstream-main' into develop
2024-11-01 17:13:04 +01:00
Claire
e44a800887
Fix missing CSS for CW margins ( #2891 )
2024-10-27 21:08:59 +01:00
Claire
40b3c206e4
Change Content Warning design to match upstream's ( #2890 )
2024-10-27 16:08:01 +01:00
Claire
eb68d81013
Merge pull request #2889 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 77cd16f4ee
2024-10-26 22:47:10 +02:00
Claire
1d3d549e96
[Glitch] Redesign Content Warning and filters
...
Port 393f0a0159
2024-10-26 14:09:46 +02:00
renovate[bot]
e8d23f6bcb
[Glitch] Update eslint (non-major)
...
Port 11a63b2db6
2024-10-26 14:00:09 +02:00
Claire
8a222b3951
Fix assets build failure on glitch-soc
2024-10-26 13:54:36 +02:00
Eugen Rochko
227bf77252
[Glitch] Change design of rich text elements in web UI
...
Port d11231a420
2024-10-26 13:53:25 +02:00
David Roetzel
50a40d1b2f
[Glitch] Do not change follow counters when already following
...
Port 029c99bd7b
2024-10-26 13:50:30 +02:00
Emelia Smith
28287eb3b2
[Glitch] Fix 'unknown' media attachment type rendering
...
Port 346cdb998c
2024-10-26 13:49:07 +02:00
Renaud Chaput
d304540ebc
[Glitch] Replace execCommand for copying text with the modern clipboard API
...
Port fb6d7ed475
2024-10-26 13:47:22 +02: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]
77cd16f4ee
Update dependency opentelemetry-instrumentation-active_job to v0.7.8 ( #32657 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-25 09:44:02 +00: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]
5f58357bbe
Update opentelemetry-ruby (non-major) ( #32631 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-25 09:15:46 +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]
0970cf818a
Update dependency pg to v1.5.9 ( #32655 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-25 09:04:53 +00:00
Matt Jankowski
1775e151ec
Simplify model validation specs for DomainAllow ( #32496 )
2024-10-25 08:42:14 +00:00
Matt Jankowski
9464281f29
Simplify model validation specs for AccountStatusCleanupPolicy ( #32495 )
2024-10-25 08:41:24 +00:00
Matt Jankowski
66c0471515
Enrich coverage for IpBlock model ( #32471 )
2024-10-25 08:35:07 +00:00
Matt Jankowski
15f6336cdd
Simplify model validation specs for AccountMigration ( #32494 )
2024-10-25 08:02:13 +00:00
Matt Jankowski
86132f7dd3
Provide establish_policy helper method in AccountStatusesCleanupPolicy spec ( #32490 )
2024-10-25 08:00:58 +00:00
Matt Jankowski
2a13d6824c
Use subject for FeedManager lib spec ( #32486 )
2024-10-25 07:59:31 +00:00
Matt Jankowski
2e3bbb6861
Move account suspension related coverage to concern spec ( #32432 )
2024-10-25 07:58:41 +00:00
Matt Jankowski
4134ccdbe0
Simplify model validation specs for WebauthnCredential ( #32466 )
2024-10-25 07:55:45 +00:00
Matt Jankowski
e5be4bf8d8
Simplify model validation specs for PreviewCard ( #32469 )
2024-10-25 07:55:33 +00:00
Matt Jankowski
37bcbeab4a
Simplify model validation spec in AccountModerationNote/ReportNote ( #31792 )
2024-10-24 12:52:38 +00:00
Matt Jankowski
dea6c454fd
Contribute more coverage for Account model ( #32474 )
2024-10-24 12:47:06 +00:00
Matt Jankowski
b16435e79f
Explore more resplendent model validation specs for Form::AdminSettings ( #32465 )
2024-10-24 12:44:13 +00:00
Matt Jankowski
67504dbf9c
Simplify uniqueness validation spec for IpBlock ( #32066 )
2024-10-24 12:43:40 +00:00
Matt Jankowski
5c910dc82e
Add coverage for DatabaseHelper primary/replica methods ( #32642 )
2024-10-24 08:04:29 +00:00
Matt Jankowski
745c4f900a
Remove unused ApplicationHelper#visibility_icon helper method ( #32644 )
2024-10-24 08:02:54 +00:00
Eugen Rochko
d11231a420
Change design of rich text elements in web UI ( #32633 )
2024-10-24 07:28:22 +00:00
Matt Jankowski
97b18d10b4
Move hcaptcha service config to config_for yml ( #30662 )
2024-10-23 14:25:43 +00:00
Matt Jankowski
35f008aa2a
Move translation service config to config_for yml ( #30663 )
2024-10-23 13:32:18 +00:00
Matt Jankowski
5a4f4f3e83
Remove single-use ProfileStories method ( #31164 )
2024-10-23 13:31:03 +00:00
Matt Jankowski
a850be4ad3
Match ruby version in lockfile to version in .ruby-version ( #31995 )
2024-10-23 13:30:09 +00:00
Matt Jankowski
2f906ed55a
Constants for account refresh ( #32420 )
2024-10-23 13:29:01 +00:00
Matt Jankowski
fae1de699c
Remove duplicate indexes from database ( #32454 )
2024-10-23 13:26:51 +00:00
Matt Jankowski
c3e684b715
Remove unused svg logos ( #32581 )
2024-10-23 13:25:49 +00:00
Claire
393f0a0159
Redesign Content Warning and filters ( #32543 )
2024-10-23 09:47:23 +00:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
Matt Jankowski
d1b20ea8f7
Worker specs coverage increase ( #32541 )
2024-10-23 07:50:20 +00:00
Matt Jankowski
bd0c826a3d
Simplify model validation specs for Announcement ( #32481 )
2024-10-23 07:47:46 +00:00
Matt Jankowski
c0f46e9031
Fortify coverage for Follow model ( #32472 )
2024-10-23 07:46:55 +00:00
Matt Jankowski
1f3722904f
Top off coverage for Appeal model ( #32464 )
2024-10-23 06:42:57 +00:00
Matt Jankowski
67403e7b01
Add coverage for ActivityPub likes/shares endpoints ( #32305 )
2024-10-23 06:41:07 +00:00
