Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream - 4.3.0-beta #53

Merged
merged 124 commits into from
Jul 19, 2024
Merged

Merge upstream - 4.3.0-beta #53

merged 124 commits into from
Jul 19, 2024

Conversation

sneakers-the-rat
Copy link
Collaborator

i saw that this one had grouped notifications in it!!!
mastodon#30440

ClearlyClaire and others added 30 commits July 5, 2024 08:54
@ClearlyClaire
Change instructions to use bundle exec rails instead of rake (mas…
8de5df2 
…todon#30917)
@mjankowski
Use scope module: ... for settings/2FA routes (mastodon#30919)
8c375d8
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30925)
8154784 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
fix(deps): update dependency cssnano to v7.0.4 (mastodon#30927)
a16c2c9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency sidekiq-scheduler to v5.0.5 (mastodon#…
05f0d51 
…30918)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@oneiros
Improve handling of encoding problems when creating link previews (ma…
016c1e4 
…stodon#30929)
@oneiros
Fix details extraction when no title exists. (mastodon#30933)
97eddb5
@ClearlyClaire
Fix right-to-left text in preview cards (mastodon#30930)
8f5694d
@ClearlyClaire
Fix overflow behavior on profile fields in hover cards (mastodon#30928)
63ba698
@ClearlyClaire
Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-s…
11dd51e 
…oc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
@ClearlyClaire
[Glitch] Fix right-to-left text in preview cards
aca1dec 
Port 8f5694d to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix overflow behavior on profile fields in hover cards
a99ae90 
Port 63ba698 to glitch-soc

Signed-off-by: Claire <[email protected]>
@mjankowski
Limit CI push triggers to main and stable-* branches (mastodon#30934
1d35626 
)
@ClearlyClaire
Merge pull request glitch-soc#2768 from ClearlyClaire/glitch-soc/merg…
6976637 
…e-upstream

Merge upstream changes up to 63ba698
@renchap
Add the account hover card for account search results (mastodon#30949)
0899c91
@renchap
Remove the title attribute when hovering a card anchor (mastodon#30948
981395e 
)
@renovate
chore(deps): update dependency @testing-library/dom to v10.3.1 (masto…
c5883e0 
…don#30954)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency typescript to v5.5.3 (mastodon#30953)
5c3ec72 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency irb to v1.14.0 (mastodon#30947)
bd84817 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency glob to v10.4.3 (mastodon#30941)
bd285cd 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use scope module: ... for more API routes (mastodon#30935)
c29fdad
@renovate
fix(deps): update dependency postcss-preset-env to v9.6.0 (mastodon#3…
fd3bfc0 
…0944)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Limit attachments to MEDIA_ATTACHMENTS_LIMIT when returning posts t…
d41b43e 
…hrough the API (mastodon#30932)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30940)
1a37862 
Co-authored-by: GitHub Actions <[email protected]>
@ileodo @renchap
Change to use an unified constant for max media attachments per status (
36d819b 
mastodon#29073)

Co-authored-by: Renaud Chaput <[email protected]>
@mjankowski
Move test migrations paths check to workflow level (mastodon#30702)
79b0e19
@mjankowski
Rename jobs/attachments rspec tag names (mastodon#29762)
f1300ad
@oneiros
Fix author names as arrays in linked data. (mastodon#30957)
fa8e972
@ClearlyClaire
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-s…
6a55232 
…oc/merge-upstream
@renchap @ClearlyClaire
[Glitch] Add the account hover card for account search results
2fa3c3a 
Port 0899c91 to glitch-soc

Signed-off-by: Claire <[email protected]>
github-actions bot and others added 25 commits July 16, 2024 15:24
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31038)
66430cb 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-s…
c546757 
…oc/merge-upstream
@ClearlyClaire
Merge pull request glitch-soc#2780 from ClearlyClaire/glitch-soc/merg…
d6a2635 
…e-upstream

Merge upstream changes up to 66430cb
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31047)
00c110a 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Reduce extra round trips in AP::FetchRemoteStatusService spec (mast…
81877e7 
…odon#31045)
@mjankowski
Reduce extra round trips in AP::SynchronizeFollowersService spec (m…
f5e90f3 
…astodon#31044)
@mjankowski
Reduce extra round trips in activitypub controller specs (mastodon#…
76c2c5c 
…31041)
@ClearlyClaire
Update rexml to version 3.3.2 (mastodon#31048)
4957771
@renovate
chore(deps): update dependency faker to v3.4.2 (mastodon#31046)
aa4d898 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-s…
5e7720d 
…oc/merge-upstream
@ClearlyClaire
Merge pull request glitch-soc#2781 from ClearlyClaire/glitch-soc/merg…
fb29f40 
…e-upstream

Merge upstream up to aa4d898
@mjankowski
Reduce extra factories in FanOutOnWriteService spec (mastodon#31053)
c5f8256
@mjankowski
Use change-requiring records in admin/reports controller spec (mastod…
2616fde 
…on#31052)
@renovate
chore(deps): update dependency ruby-vips to v2.2.2 (mastodon#31050)
64c7ffd 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Reduce factory creation in AP::ProcessStatusUpdateService spec (mas…
47ea83d 
…todon#31051)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31055)
7d090b2 
Co-authored-by: GitHub Actions <[email protected]>
@renchap @Gargron @ClearlyClaire
Grouped Notifications UI (mastodon#30440)
f587ff6 
Co-authored-by: Eugen Rochko <[email protected]>
Co-authored-by: Claire <[email protected]>
@ClearlyClaire
Fix grouping across hourly buckets happening in a 12 seconds window i…
6e47637 
…nstead of 12 hours window (mastodon#31062)
@renovate
fix(deps): update dependency use-debounce to v10.0.1 (mastodon#31060)
41b7281 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Reduce factory creation in MediaAttachment model spec (mastodon#31058)
848b59c
@mjankowski
Add link to org-level contribution guidelines to contributing doc (ma…
8234434 
…stodon#31043)
@ClearlyClaire
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-s…
c75fe09 
…oc/merge-upstream
@renchap @Gargron @ClearlyClaire
[Glitch] Grouped Notifications UI
7224e24 
Port f587ff6 to glitch-soc

Co-authored-by: Eugen Rochko <[email protected]>
Co-authored-by: Claire <[email protected]>
Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Merge pull request glitch-soc#2782 from ClearlyClaire/glitch-soc/merg…
d55ecf4 
…e-upstream

Merge upstream changes up to 8234434
@sneakers-the-rat
Merge branch 'glitch-soc-main' into merge-upstream
af24bf9
@sneakers-the-rat
Copy link
Collaborator Author

moved mathjax componentWillMount to the constructor, fixed the css rule that made it float off to the side

@sneakers-the-rat sneakers-the-rat merged commit c567ffb into dev Jul 19, 2024
30 checks passed
@sneakers-the-rat sneakers-the-rat mentioned this pull request Jul 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
upgrade
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.