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

Sync Upstream #5

Merged
merged 47 commits into from
Jan 29, 2025
Merged

Sync Upstream #5

merged 47 commits into from
Jan 29, 2025

Conversation

bingxin666
Copy link
Collaborator

No description provided.

ClearlyClaire and others added 30 commits January 23, 2025 12:54
@ClearlyClaire
Convert LanguageDropdown to a functional component (mastodon#33701)
db14604
@Gargron
Add information about alt text to alt text modal in web UI (mastodon#…
0885c31 
…33702)
@mjankowski
Fix intermittent services/ap/process_status_update tags failure (mast…
51ecc73 
…odon#33695)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33697)
1b2c952 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Change “Prohibited uses” section of ToS template according to feedback (
ffaf458 
mastodon#33703)
@ClearlyClaire
Remove broken link to Terms of Service when none are defined (mastodo…
4b4de02 
…n#33699)
@ClearlyClaire
Fix LDSignature tests (mastodon#33705)
7261951
@c960657
Store Bootsnap cache outside bind mounts (devcontainer only) (mastodo…
5c50d89 
…n#33677)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33711)
e44b784 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Use expect params wrapper for more "auth" and "2FA" "controllers" (m…
a1d9c3f 
…astodon#33717)
@ClearlyClaire
Convert LanguageDropdownMenu to functional component (mastodon#33704)
9a0166c
@renovate
Update babel monorepo to v7.26.7 (mastodon#33721)
469c8f8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Style/HashSlice cop violations (mastodon#33720)
f73df1f
@renovate
Update dependency react-select to v5.10.0 (mastodon#33722)
79cbb61 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Gargron
Fix wrong styles on rules and buttons in the sign-up form (mastodon#3…
2df86d6 
…3725)
@Gargron
Refactor <LanguageDropdown> into TypeScript (mastodon#33723)
52a5c8a
@Gargron
Fix color of language indicator in light theme in web UI (mastodon#33724
81271a1 
)
@Gargron
Remove system tooltip for alt text in web UI (mastodon#33736)
9568733
@mikkelricky
Fix documentation URL (mastodon#33728)
2bfcda1
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33731)
b53bf23 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update formatjs monorepo (mastodon#33656)
f8f3182 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency ox to v2.14.21 (mastodon#33740)
df63470 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @reduxjs/toolkit to v2.5.1 (mastodon#33739)
b868e30 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renchap
Add an optional metric exporter (mastodon#33734)
5938428
@mjankowski
Use expect for admin/ controllers (mastodon#33686)
65d9171
@mjankowski
Use expect in Admin::ExportControllerConcern import params (masto…
d3b637c 
…don#33745)
@ClearlyClaire
Add hover cards to follow suggestions (mastodon#33749)
e973351
@ClearlyClaire
Fix error in TwoFactorPamAuthenticatable when handling invalid para…
ea743d6 
…ms (mastodon#33746)
@mjankowski
Use expect in remaining controller locations (mastodon#33748)
93f3c72
@ClearlyClaire
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-s…
fcc5262 
…oc/merge-upstream

Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
ClearlyClaire and others added 17 commits January 27, 2025 18:20
@ClearlyClaire
[Glitch] Convert LanguageDropdown to a functional component
c14c553 
Port db14604 to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Add information about alt text to alt text modal in web UI
17af994 
Port 0885c31 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Convert LanguageDropdownMenu to functional component
75e304d 
Port 9a0166c to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Refactor <LanguageDropdown> into TypeScript
12bdf58 
Port 52a5c8a to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Fix color of language indicator in light theme in web UI
a21f357 
Port 81271a1 to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Remove system tooltip for alt text in web UI
560eaff 
Port 9568733 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Add hover cards to follow suggestions
e736363 
Port e973351 to glitch-soc

Signed-off-by: Claire <[email protected]>
@mjankowski
Reduce factory creation across controllers/admin specs (mastodon#33752
8a2d764 
)
@ClearlyClaire
Fix parameter validation in our custom devise strategies (mastodon#33754
6646a0a 
)
@renovate
Update RuboCop (non-major) to v1.71.0 (mastodon#33644)
0091459 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33753)
80f72ee 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Fix polls not being validated on edition (mastodon#33755)
32aa83e
@ClearlyClaire
Fix incorrect signature after HTTP redirect (mastodon#33757)
5b291fc
@ClearlyClaire
Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-s…
353e5f7 
…oc/merge-upstream

Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
@ClearlyClaire
Merge pull request glitch-soc#2955 from ClearlyClaire/glitch-soc/merg…
6be5a8d 
…e-upstream

Merge upstream changes up to 5b291fc
@wackbyte
Sync Glitch follow button with Mastodon (glitch-soc#2957)
b740b17 
Fixes the follow button saying "Follow back" when it actually will
cancel the follow request (mastodon#31934). Intentionally omits
the "Mutual" state.
@TheEssem
Merge remote-tracking branch 'upstream/main'
da674a0
@bingxin666 bingxin666 merged commit c9db57b into BakaAC:main Jan 29, 2025
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.
9 participants
@bingxin666 @ClearlyClaire @Gargron @mjankowski @c960657 @mikkelricky @renchap @wackbyte @TheEssem