Merge Upstream - 4.3.0 #67
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
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…non-bugfix updates (mastodon#32106)
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream
…b UI Port 3426ea2 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 7a62d57 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 89c39e7 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 106b22b to glitch-soc Signed-off-by: Claire <[email protected]>
Port 24d3ce7 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 28c4eca to glitch-soc Signed-off-by: Claire <[email protected]>
Port 89df27a to glitch-soc Signed-off-by: Claire <[email protected]>
…b UI Port a04433f to glitch-soc Signed-off-by: Claire <[email protected]>
Port 11a12e5 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 9d664f8
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[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>
This should not change the set of words matched by `USERNAME_RE` but does change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed a domain part to start with `.` or `-`, which the new regexp does not allow.
…oc/merge-upstream
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
… regional variant (mastodon#32580)
…oc/merge-upstream Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes. - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.
…nguages Port 51345e5 to glitch-soc Signed-off-by: Claire <[email protected]>
…, for real Port 5e4cc1a to glitch-soc Signed-off-by: Claire <[email protected]>
Port 5afdb81 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 7a7a7cc to glitch-soc Signed-off-by: Claire <[email protected]>
…ations Port 25f8003 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 6c87c76 to glitch-soc Signed-off-by: Claire <[email protected]>
…`fediverse:creator` Port 8b56509 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 0f37b7d to glitch-soc Signed-off-by: Claire <[email protected]>
Port 1fc165d to glitch-soc Signed-off-by: Claire <[email protected]>
Port bc2e642 to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 1fc165d
|
test failure is just bc ffmpeg server struggling, merging |
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.
I think this doesn't have any more version tags than this? just ye olde merge upstream