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 changes up to 5acec087caed4a2fdf0fd8ed11f891222496f321 #2836

Merged
merged 23 commits into from
Sep 5, 2024
Merged

Merge upstream changes up to 5acec087caed4a2fdf0fd8ed11f891222496f321 #2836

merged 23 commits into from
Sep 5, 2024

Conversation

ClearlyClaire
Copy link

Ported changes

Postponed changes

Skipped changes

  • bc435c6 (this is already the default in glitch-soc; that being said, instead of a default, it could be changed to be the only option…)

mjankowski and others added 23 commits September 4, 2024 17:29
@mjankowski
Use response.parsed_body for html response checks (mastodon#31750)
e1b5f3f
@ClearlyClaire
Fix email language when recipient has no selected locale (mastodon#31747
559958f 
)
@mjankowski
Add AnnualReport::Source#report_statuses method for subclasses to u…
4678473 
…se (mastodon#31753)
@mjankowski
Remove before block in spec with TODOs which have been TO-DONE alre…
4d5c91e 
…ady (mastodon#31754)
@oneiros
Support REDIS_SENTINEL_PORT variables (mastodon#31767)
7d91723
@Gargron
Change design of unread conversations in web UI (mastodon#31763)
ec4c490
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31765)
eb23d9f 
Co-authored-by: GitHub Actions <noreply@github.com>
@Gargron
Fix wrong width on content warnings and filters in web UI (mastodon#3…
b265a65 
…1761)
@mjankowski
Add coverage for Account#prepare_contents callback (mastodon#31748)
ba9fd1c
@fowl2 @mjankowski
Direct link to each authorized_application entry with html anchor (ma…
f9712fa 
…stodon#31677)

Co-authored-by: Matt Jankowski <matt@jankowski.online>
@renovate
Update dependency cssnano to v7.0.6 (mastodon#31757)
bd8cd0c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Update parser and rubocop gems (mastodon#31760)
8fd3e37
@renovate
Update docker.io/ruby Docker tag to v3.3.5 (mastodon#31758)
5b1ae15 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Convert invites controller spec to system/request specs (mastodon#31755)
e820cc3
@vmstan
Fix radio checkbox visibility in Report dialogs (mastodon#31752)
b4b639e
@oneiros
Add credentials to redis sentinel configuration (mastodon#31768)
f85694a
@mjankowski
Remove references to deprecated Import model (mastodon#31759)
d58faa2
@mjankowski
Use conflicted configuration for renovate rebase strategy (mastodon…
850478d 
…#31770)
@Gargron
Change width of columns in advanced web UI (mastodon#31762)
bc435c6
@mjankowski
Simplify basic presence validations (mastodon#29664)
5acec08
@ClearlyClaire
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-s…
1a0ef0c 
…oc/merge-upstream
@Gargron @ClearlyClaire
[Glitch] Change design of unread conversations in web UI
cb324b5 
Port ec4c490 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@vmstan @ClearlyClaire
[Glitch] Fix radio checkbox visibility in Report dialogs
db6b1fe 
Port b4b639e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review September 5, 2024 19:26
@ClearlyClaire ClearlyClaire merged commit 4cd7458 into glitch-soc:main Sep 5, 2024
37 checks passed
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ClearlyClaire @mjankowski @oneiros @Gargron @fowl2 @vmstan