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

Fix LDSignature tests #33705

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Fix LDSignature tests #33705

merged 1 commit into from
Jan 23, 2025

Conversation

ClearlyClaire
Copy link
Contributor

No description provided.

@ClearlyClaire ClearlyClaire added the to backport PR needed to be backported label Jan 23, 2025
@ClearlyClaire ClearlyClaire requested a review from a team January 23, 2025 16:21
@Gargron Gargron added this pull request to the merge queue Jan 23, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 23, 2025
@ClearlyClaire ClearlyClaire added this pull request to the merge queue Jan 23, 2025
Merged via the queue into main with commit 7261951 Jan 23, 2025
34 checks passed
@ClearlyClaire ClearlyClaire deleted the fixes/ldsig-test branch January 23, 2025 18:10
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 <smswessem@gmail.com>
Date:   Tue Jan 28 21:30:13 2025 -0600

    Merge remote-tracking branch 'upstream/main'

commit b740b17
Author: wackbyte <wackbyte@protonmail.com>
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 <claire.github-309c@sitedethib.com>
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 <claire.github-309c@sitedethib.com>
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 <claire.github-309c@sitedethib.com>
Date:   Tue Jan 28 15:44:27 2025 +0100

    Fix incorrect signature after HTTP redirect (mastodon#33757)

commit 32aa83e
Author: Claire <claire.github-309c@sitedethib.com>
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 <noreply@github.com>

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 <claire.github-309c@sitedethib.com>
Date:   Tue Jan 28 09:21:59 2025 +0100

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

commit 8a2d764
Author: Matt Jankowski <matt@jankowski.online>
Date:   Tue Jan 28 03:08:16 2025 -0500

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

commit e736363
Author: Claire <claire.github-309c@sitedethib.com>
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 <claire.github-309c@sitedethib.com>

commit 560eaff
Author: Eugen Rochko <eugen@zeonfederated.com>
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 <claire.github-309c@sitedethib.com>

commit a21f357
Author: Eugen Rochko <eugen@zeonfederated.com>
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 <claire.github-309c@sitedethib.com>

commit 12bdf58
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon Jan 27 09:06:33 2025 +0100

    [Glitch] Refactor `<LanguageDropdown>` into TypeScript

    Port 52a5c8a to glitch-soc

    Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit 75e304d
Author: Claire <claire.github-309c@sitedethib.com>
Date:   Fri Jan 24 17:11:23 2025 +0100

    [Glitch] Convert `LanguageDropdownMenu` to functional component

    Port 9a0166c to glitch-soc

    Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit 17af994
Author: Eugen Rochko <eugen@zeonfederated.com>
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 <claire.github-309c@sitedethib.com>

commit c14c553
Author: Claire <claire.github-309c@sitedethib.com>
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 <claire.github-309c@sitedethib.com>

commit fcc5262
Merge: 43e1a24 93f3c72
Author: Claire <claire.github-309c@sitedethib.com>
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 <matt@jankowski.online>
Date:   Mon Jan 27 11:32:06 2025 -0500

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

commit ea743d6
Author: Claire <claire.github-309c@sitedethib.com>
Date:   Mon Jan 27 17:30:18 2025 +0100

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

commit e973351
Author: Claire <claire.github-309c@sitedethib.com>
Date:   Mon Jan 27 17:24:41 2025 +0100

    Add hover cards to follow suggestions (mastodon#33749)

commit d3b637c
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Jan 27 09:29:25 2025 -0500

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

commit 65d9171
Author: Matt Jankowski <matt@jankowski.online>
Date:   Mon Jan 27 09:05:16 2025 -0500

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

commit 5938428
Author: Renaud Chaput <renchap@gmail.com>
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 <noreply@github.com>

commit 2bfcda1
Author: Mikkel Ricky <mikkel@mikkelricky.dk>
Date:   Mon Jan 27 09:23:53 2025 +0100

    Fix documentation URL (mastodon#33728)

commit 9568733
Author: Eugen Rochko <eugen@zeonfederated.com>
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 <eugen@zeonfederated.com>
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 <eugen@zeonfederated.com>
Date:   Mon Jan 27 09:06:33 2025 +0100

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

commit 2df86d6
Author: Eugen Rochko <eugen@zeonfederated.com>
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 <matt@jankowski.online>
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 <claire.github-309c@sitedethib.com>
Date:   Fri Jan 24 17:11:23 2025 +0100

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

commit a1d9c3f
Author: Matt Jankowski <matt@jankowski.online>
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 <noreply@github.com>

commit 5c50d89
Author: Christian Schmidt <github@chsc.dk>
Date:   Fri Jan 24 09:18:46 2025 +0100

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

commit 7261951
Author: Claire <claire.github-309c@sitedethib.com>
Date:   Thu Jan 23 18:56:33 2025 +0100

    Fix LDSignature tests (mastodon#33705)

commit 4b4de02
Author: Claire <claire.github-309c@sitedethib.com>
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 <claire.github-309c@sitedethib.com>
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 <noreply@github.com>

commit 51ecc73
Author: Matt Jankowski <matt@jankowski.online>
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 <eugen@zeonfederated.com>
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 <claire.github-309c@sitedethib.com>
Date:   Thu Jan 23 13:54:23 2025 +0100

    Convert `LanguageDropdown` to a functional component (mastodon#33701)
bingxin666 added a commit to BakaAC/mastodon that referenced this pull request Jan 29, 2025
@bingxin666 @ClearlyClaire
@Gargron @mjankowski @github-actions @web-flow @c960657 @renovate @mikkelricky @renchap @wackbyte @TheEssem
Sync Upstream (#5)
c9db57b 
* Convert `LanguageDropdown` to a functional component (mastodon#33701)

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

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

* New Crowdin Translations (automated) (mastodon#33697)

Co-authored-by: GitHub Actions <noreply@github.com>

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

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

* Fix LDSignature tests (mastodon#33705)

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

* New Crowdin Translations (automated) (mastodon#33711)

Co-authored-by: GitHub Actions <noreply@github.com>

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

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

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

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

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

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

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

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

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

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

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

* Fix documentation URL (mastodon#33728)

* New Crowdin Translations (automated) (mastodon#33731)

Co-authored-by: GitHub Actions <noreply@github.com>

* Update formatjs monorepo (mastodon#33656)

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

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

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

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

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

* Add an optional metric exporter (mastodon#33734)

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

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

* Add hover cards to follow suggestions (mastodon#33749)

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

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

* [Glitch] Convert `LanguageDropdown` to a functional component

Port db14604 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

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

Port 0885c31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Convert `LanguageDropdownMenu` to functional component

Port 9a0166c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Refactor `<LanguageDropdown>` into TypeScript

Port 52a5c8a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

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

Port 81271a1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

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

Port 9568733 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Add hover cards to follow suggestions

Port e973351 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

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

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

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

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

* New Crowdin Translations (automated) (mastodon#33753)

Co-authored-by: GitHub Actions <noreply@github.com>

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

* Fix incorrect signature after HTTP redirect (mastodon#33757)

* 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.

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Mikkel Ricky <mikkel@mikkelricky.dk>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: wackbyte <wackbyte@protonmail.com>
Co-authored-by: Essem <smswessem@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oneiros oneiros oneiros approved these changes

Assignees
No one assigned
Labels
to backport PR needed to be backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ClearlyClaire @oneiros