Commit graph

23673 commits

Author SHA1 Message Date
Jeremy Kescher
a5ebd0eb05
Bump Catstodon revision to 1.0.1
Some checks failed
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Check formatting / 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
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (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 (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-20 13:31:06 +02:00
Jeremy Kescher
2819f96f93
Prevent status content click on detailed status view again 2024-09-20 13:18:55 +02:00
Jeremy Kescher
edcfe93845
Mark future versions as nightly
Some checks failed
Check i18n / check-i18n (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
CodeQL / Analyze (ruby) (push) Waiting to run
Check formatting / lint (push) Waiting to run
JavaScript Linting / lint (push) Waiting to run
Ruby Linting / lint (push) Waiting to run
JavaScript Testing / test (push) Waiting to run
Historical data migration test / test (14-alpine) (push) Waiting to run
Historical data migration test / test (15-alpine) (push) Waiting to run
Ruby Testing / build (production) (push) Waiting to run
Ruby Testing / build (test) (push) Waiting to run
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Ruby Testing / test (3.1) (push) Blocked by required conditions
Ruby Testing / test (3.2) (push) Blocked by required conditions
Ruby Testing / Libvips tests (.ruby-version) (push) Blocked by required conditions
Ruby Testing / Libvips tests (3.1) (push) Blocked by required conditions
Ruby Testing / Libvips tests (3.2) (push) Blocked by required conditions
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.1) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Bundler Audit / security (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
2024-09-20 12:17:38 +02:00
Jeremy Kescher
566205ab1c
Rename Mastodon::RejectPayload to Mastodon::RejectPayloadError to match naming scheme for ValidationErrors 2024-09-20 11:56:27 +02:00
Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
Also apply "Make addReaction and removeReaction optional props", therefore:

Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02:00
Claire
486e61677c
Merge pull request #2848 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 3e91c101b3
2024-09-17 18:34:28 +02:00
Claire
6bd86fede0 [Glitch] Increase no-gap-breakpoint by 32px to fix overflow
Port d2f9075078 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Michael Stanclift
a85b2476c2 [Glitch] Fix background of text detection progress
Port 5a33a5658b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Claire
93b2c8164e [Glitch] Fix selectSettingsNotificationsExcludedTypes not being memoized properly
Port ca8e892c1a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Claire
11de3dbef6 [Glitch] Enable grouped notifications unconditionally
Port c620452fd7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Claire
6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
Claire
3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
David Roetzel
d8f9db547a
Merge commit from fork
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-09-17 16:59:29 +02:00
github-actions[bot]
6a233cbfcf
New Crowdin Translations (automated) (#31946)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-17 13:02:53 +00:00
Claire
d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow (#31889) 2024-09-17 03:19:42 +00:00
Michael Stanclift
5a33a5658b
Fix background of text detection progress (#31943) 2024-09-17 03:19:04 +00:00
Claire
18209d2011
Merge pull request #2847 from ClearlyClaire/glitch-soc/fixes/click-detailed-status
Fix detailed statuses being clickable and linking to broken pages
2024-09-16 23:51:37 +02:00
Claire
c8ef702ba9
Merge pull request #2846 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to e0648a916a
2024-09-16 23:31:03 +02:00
Claire
43f6792e1b Fix detailed statuses being clickable and linking to broken pages 2024-09-16 22:51:19 +02:00
Claire
0740352ce6 [Glitch] Rename /api/v2_alpha/notifications* to /api/v2/notifications*
Port e0648a916a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Eugen Rochko
b6398cf2d3 [Glitch] Fix horizontal scrollbar on who to follow carousel in web UI
Port efb0e2c34b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Claire
e25634ccef [Glitch] Convert notification requests actions and reducers to Typescript
Port c0eda832f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Claire
665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
2024-09-16 21:08:58 +02:00
Claire
ca8e892c1a
Fix selectSettingsNotificationsExcludedTypes not being memoized properly (#31881) 2024-09-16 14:51:56 +00:00
Claire
6c76a7a907
Fix cancel follow request button sometimes saying “Follow back” (#31934) 2024-09-16 13:20:44 +00:00
Claire
c620452fd7
Enable grouped notifications unconditionally (#31929) 2024-09-16 13:12:10 +00:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840) 2024-09-16 12:10:02 +00:00
Eugen Rochko
efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI (#31912) 2024-09-16 12:08:37 +00:00
Claire
c0eda832f3
Convert notification requests actions and reducers to Typescript (#31866) 2024-09-16 09:54:03 +00:00
Claire
d5cf27e667
Add global Regexp timeout (#31928) 2024-09-16 09:40:18 +00:00
Matt Jankowski
c54cbf7943
Remove follow creation from ListAccount fabricator (#31902) 2024-09-16 08:56:40 +00:00
github-actions[bot]
474abf3c7f
New Crowdin Translations (automated) (#31911)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-16 08:48:20 +00:00
Claire
1d58f93670
Update dependencies omniauth-saml, ruby-xml and ruby-saml (#31926) 2024-09-16 08:48:13 +00:00
Matt Jankowski
bf8b55ce91
Enable Rails/Output in spec/ dir (#31905) 2024-09-16 08:29:06 +00:00
Matt Jankowski
abd2f5654a
Add validation coverage for CustomEmoji shortcode value (#31906) 2024-09-16 07:53:03 +00:00
Matt Jankowski
822e918a56
Add coverage for Bookmark validation and reblog/status check callback (#31907) 2024-09-16 07:52:22 +00:00
renovate[bot]
c24de04f9c
Update dependency postcss to v8.4.47 (#31913)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-16 07:51:36 +00:00
renovate[bot]
9ea270526c
Update DefinitelyTyped types (non-major) (#31922)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-16 07:51:13 +00:00
renovate[bot]
2afaa3b3d4
Update dependency husky to v9.1.6 (#31923)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-16 07:50:51 +00:00
renovate[bot]
0cc05fbb7c
Update dependency i18n to v1.14.6 (#31925)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-16 07:50:43 +00:00
Claire
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips (#31904) 2024-09-14 00:16:02 +00:00
Claire
346919178d
Merge pull request #2845 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 5ba3405be4
2024-09-13 23:40:06 +02:00
Claire
117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
Claire
065abf2918
Merge pull request #2843 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 0226bbe516
2024-09-13 21:35:17 +02:00
renovate[bot]
5ba3405be4
Update dependency opentelemetry-instrumentation-pg to '~> 0.29.0' (#31897)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-13 12:07:33 +00:00
David Roetzel
c1b2c4fd9a
Strip protocol from attribution domains (#31900) 2024-09-13 11:37:15 +00:00
Claire
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899) 2024-09-13 09:11:10 +00:00
Matt Jankowski
a2c4f5f5c0
Add coverage for ListAccount follow/follow_request set up (#31896) 2024-09-13 08:49:03 +00:00
Matt Jankowski
49cbee3836
Remove unused argument from AccountMigration.within_cooldown (#31892) 2024-09-13 08:43:21 +00:00
github-actions[bot]
353ade767b
New Crowdin Translations (automated) (#31898)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-13 08:41:46 +00:00