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 5b291fcbe41564264954618fb1f4086a3be1c600 #2955

Merged
merged 44 commits into from
Jan 28, 2025
Merged

Merge upstream changes up to 5b291fcbe41564264954618fb1f4086a3be1c600 #2955

merged 44 commits into from
Jan 28, 2025

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jan 24, 2025 •
edited
Loading

Merge upstream changes up to 93f3c72

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.

Ported changes

Merge upstream changes up to 5b291fc

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 and others added 14 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>
@ClearlyClaire
Copy link
Author

There are outstanding issues, like LanguageDropdown not passing intl to LanguageDropdownMenu (also an upstream issue), or the failing test.

So we will wait for upstream to fix that before merging.

Gargron and others added 15 commits January 24, 2025 22:20
@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 and others added 8 commits January 27, 2025 18:19
@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
[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]>
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 4eff77f to e736363 Compare January 27, 2025 17:27
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to 79cbb6160d9e374c6274da7d44de0e663a978a37 Merge upstream changes up to 93f3c724aea4efe874054b2f546fff91f0bf731b Jan 27, 2025
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from a3ccf1a to 5899350 Compare January 27, 2025 19:39
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 5899350 to f5262f5 Compare January 28, 2025 17:15
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to 93f3c724aea4efe874054b2f546fff91f0bf731b Merge upstream changes up to 5b291fcbe41564264954618fb1f4086a3be1c600 Jan 28, 2025
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 28, 2025 17:16
@ClearlyClaire ClearlyClaire marked this pull request as draft January 28, 2025 17:16
@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 ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from f5262f5 to 353e5f7 Compare January 28, 2025 17:29
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 28, 2025 18:58
@ClearlyClaire ClearlyClaire merged commit 6be5a8d into glitch-soc:main Jan 28, 2025
39 checks passed
bingxin666 added a commit to BakaAC/mastodon that referenced this pull request Jan 29, 2025
@bingxin666
Squashed commit of the following:
987556e 
commit da674a0
Merge: c5a7789 b740b17
Author: Essem <[email protected]>
Date:   Tue Jan 28 21:30:13 2025 -0600

    Merge remote-tracking branch 'upstream/main'

commit b740b17
Author: wackbyte <[email protected]>
Date:   Tue Jan 28 20:22:19 2025 +0000

    Sync Glitch follow button with Mastodon (glitch-soc#2957)

    Fixes the follow button saying "Follow back" when it actually will
    cancel the follow request (mastodon#31934). Intentionally omits
    the "Mutual" state.

commit 6be5a8d
Merge: 43e1a24 353e5f7
Author: Claire <[email protected]>
Date:   Tue Jan 28 21:22:02 2025 +0100

    Merge pull request glitch-soc#2955 from ClearlyClaire/glitch-soc/merge-upstream

    Merge upstream changes up to 5b291fc

commit 353e5f7
Merge: e736363 5b291fc
Author: Claire <[email protected]>
Date:   Tue Jan 28 18:13:56 2025 +0100

    Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/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.

commit 5b291fc
Author: Claire <[email protected]>
Date:   Tue Jan 28 15:44:27 2025 +0100

    Fix incorrect signature after HTTP redirect (mastodon#33757)

commit 32aa83e
Author: Claire <[email protected]>
Date:   Tue Jan 28 15:38:18 2025 +0100

    Fix polls not being validated on edition (mastodon#33755)

commit 80f72ee
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Jan 28 10:40:50 2025 +0100

    New Crowdin Translations (automated) (mastodon#33753)

    Co-authored-by: GitHub Actions <[email protected]>

commit 0091459
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Jan 28 09:39:50 2025 +0100

    Update RuboCop (non-major) to v1.71.0 (mastodon#33644)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 6646a0a
Author: Claire <[email protected]>
Date:   Tue Jan 28 09:21:59 2025 +0100

    Fix parameter validation in our custom devise strategies (mastodon#33754)

commit 8a2d764
Author: Matt Jankowski <[email protected]>
Date:   Tue Jan 28 03:08:16 2025 -0500

    Reduce factory creation across `controllers/admin` specs (mastodon#33752)

commit e736363
Author: Claire <[email protected]>
Date:   Mon Jan 27 17:24:41 2025 +0100

    [Glitch] Add hover cards to follow suggestions

    Port e973351 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 560eaff
Author: Eugen Rochko <[email protected]>
Date:   Mon Jan 27 09:17:59 2025 +0100

    [Glitch] Remove system tooltip for alt text in web UI

    Port 9568733 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit a21f357
Author: Eugen Rochko <[email protected]>
Date:   Mon Jan 27 09:08:31 2025 +0100

    [Glitch] Fix color of language indicator in light theme in web UI

    Port 81271a1 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 12bdf58
Author: Eugen Rochko <[email protected]>
Date:   Mon Jan 27 09:06:33 2025 +0100

    [Glitch] Refactor `<LanguageDropdown>` into TypeScript

    Port 52a5c8a to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 75e304d
Author: Claire <[email protected]>
Date:   Fri Jan 24 17:11:23 2025 +0100

    [Glitch] Convert `LanguageDropdownMenu` to functional component

    Port 9a0166c to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit 17af994
Author: Eugen Rochko <[email protected]>
Date:   Thu Jan 23 14:01:11 2025 +0100

    [Glitch] Add information about alt text to alt text modal in web UI

    Port 0885c31 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit c14c553
Author: Claire <[email protected]>
Date:   Thu Jan 23 13:54:23 2025 +0100

    [Glitch] Convert `LanguageDropdown` to a functional component

    Port db14604 to glitch-soc

    Signed-off-by: Claire <[email protected]>

commit fcc5262
Merge: 43e1a24 93f3c72
Author: Claire <[email protected]>
Date:   Mon Jan 27 18:19:09 2025 +0100

    Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/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.

commit 93f3c72
Author: Matt Jankowski <[email protected]>
Date:   Mon Jan 27 11:32:06 2025 -0500

    Use `expect` in remaining controller locations (mastodon#33748)

commit ea743d6
Author: Claire <[email protected]>
Date:   Mon Jan 27 17:30:18 2025 +0100

    Fix error in `TwoFactorPamAuthenticatable` when handling invalid params (mastodon#33746)

commit e973351
Author: Claire <[email protected]>
Date:   Mon Jan 27 17:24:41 2025 +0100

    Add hover cards to follow suggestions (mastodon#33749)

commit d3b637c
Author: Matt Jankowski <[email protected]>
Date:   Mon Jan 27 09:29:25 2025 -0500

    Use `expect` in `Admin::ExportControllerConcern` import params (mastodon#33745)

commit 65d9171
Author: Matt Jankowski <[email protected]>
Date:   Mon Jan 27 09:05:16 2025 -0500

    Use `expect` for `admin/` controllers (mastodon#33686)

commit 5938428
Author: Renaud Chaput <[email protected]>
Date:   Mon Jan 27 13:52:30 2025 +0100

    Add an optional metric exporter (mastodon#33734)

commit b868e30
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jan 27 12:47:23 2025 +0000

    Update dependency @reduxjs/toolkit to v2.5.1 (mastodon#33739)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit df63470
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jan 27 12:47:20 2025 +0000

    Update dependency ox to v2.14.21 (mastodon#33740)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit f8f3182
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Jan 27 13:46:11 2025 +0100

    Update formatjs monorepo (mastodon#33656)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit b53bf23
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Jan 27 09:39:56 2025 +0100

    New Crowdin Translations (automated) (mastodon#33731)

    Co-authored-by: GitHub Actions <[email protected]>

commit 2bfcda1
Author: Mikkel Ricky <[email protected]>
Date:   Mon Jan 27 09:23:53 2025 +0100

    Fix documentation URL (mastodon#33728)

commit 9568733
Author: Eugen Rochko <[email protected]>
Date:   Mon Jan 27 09:17:59 2025 +0100

    Remove system tooltip for alt text in web UI (mastodon#33736)

commit 81271a1
Author: Eugen Rochko <[email protected]>
Date:   Mon Jan 27 09:08:31 2025 +0100

    Fix color of language indicator in light theme in web UI (mastodon#33724)

commit 52a5c8a
Author: Eugen Rochko <[email protected]>
Date:   Mon Jan 27 09:06:33 2025 +0100

    Refactor `<LanguageDropdown>` into TypeScript (mastodon#33723)

commit 2df86d6
Author: Eugen Rochko <[email protected]>
Date:   Fri Jan 24 23:20:05 2025 +0100

    Fix wrong styles on rules and buttons in the sign-up form (mastodon#33725)

commit 79cbb61
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jan 24 18:16:22 2025 +0100

    Update dependency react-select to v5.10.0 (mastodon#33722)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit f73df1f
Author: Matt Jankowski <[email protected]>
Date:   Fri Jan 24 11:57:55 2025 -0500

    Fix `Style/HashSlice` cop violations (mastodon#33720)

commit 469c8f8
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Jan 24 17:49:48 2025 +0100

    Update babel monorepo to v7.26.7 (mastodon#33721)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 9a0166c
Author: Claire <[email protected]>
Date:   Fri Jan 24 17:11:23 2025 +0100

    Convert `LanguageDropdownMenu` to functional component (mastodon#33704)

commit a1d9c3f
Author: Matt Jankowski <[email protected]>
Date:   Fri Jan 24 09:40:20 2025 -0500

    Use `expect` params wrapper for more "auth" and "2FA" "controllers" (mastodon#33717)

commit e44b784
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Jan 24 10:06:25 2025 +0100

    New Crowdin Translations (automated) (mastodon#33711)

    Co-authored-by: GitHub Actions <[email protected]>

commit 5c50d89
Author: Christian Schmidt <[email protected]>
Date:   Fri Jan 24 09:18:46 2025 +0100

    Store Bootsnap cache outside bind mounts (devcontainer only) (mastodon#33677)

commit 7261951
Author: Claire <[email protected]>
Date:   Thu Jan 23 18:56:33 2025 +0100

    Fix LDSignature tests (mastodon#33705)

commit 4b4de02
Author: Claire <[email protected]>
Date:   Thu Jan 23 15:34:30 2025 +0100

    Remove broken link to Terms of Service when none are defined (mastodon#33699)

commit ffaf458
Author: Claire <[email protected]>
Date:   Thu Jan 23 15:09:33 2025 +0100

    Change “Prohibited uses” section of ToS template according to feedback (mastodon#33703)

commit 1b2c952
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Jan 23 13:36:03 2025 +0000

    New Crowdin Translations (automated) (mastodon#33697)

    Co-authored-by: GitHub Actions <[email protected]>

commit 51ecc73
Author: Matt Jankowski <[email protected]>
Date:   Thu Jan 23 08:35:19 2025 -0500

    Fix intermittent services/ap/process_status_update tags failure (mastodon#33695)

commit 0885c31
Author: Eugen Rochko <[email protected]>
Date:   Thu Jan 23 14:01:11 2025 +0100

    Add information about alt text to alt text modal in web UI (mastodon#33702)

commit db14604
Author: Claire <[email protected]>
Date:   Thu Jan 23 13:54:23 2025 +0100

    Convert `LanguageDropdown` to a functional component (mastodon#33701)
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 @Gargron @mjankowski @c960657 @mikkelricky @renchap