Merge/glitch/20240204 #80
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…astodon#27792) Co-authored-by: Claire <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…n#28858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…28415) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
… `CLI::Maintenance` task (mastodon#28281)
Co-authored-by: Claire <[email protected]>
…oc/merge-upstream
…malink Port SCSS changes from b19ae52 to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>
Port 5a838ce to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 3205a65
…oc/merge-upstream Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.
…e-upstream Merge upstream changes up to bf153b3
Port 3205a65 to glitch-soc Signed-off-by: Claire <[email protected]> Co-authored-by: Eugen Rochko <[email protected]>
…d-action Add github action workflow for manual security builds
…s/failures Configure selenium to use Chrome version 120 (mastodon#29038)
…s/security-builds-latest Fix security builds not being tagged latest
* Fix insufficient origin validation * Bump version to 4.3.0-alpha.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.