Merge upstream changes up to b7902225d698a107df2cf8b4ca221caad38fa464 #2701
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: Claire <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
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>
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>
…0111) 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]>
…#30113) Co-authored-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs`
…oc/merge-upstream
… web UI Port 7401283 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 0ec061a to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4ef0b48 to glitch-soc Signed-off-by: Claire <[email protected]>
Port de4a7bf to glitch-soc Signed-off-by: Claire <[email protected]>
…ole file Port 65093c6 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 4f4b779 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 3690906 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4527e01 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`
…l components Port b9b4db4 to glitch-soc Signed-off-by: Claire <[email protected]>
…nterface search Port 7d3fe2b to glitch-soc Signed-off-by: Claire <[email protected]>
Port 26e10aa to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.
Port 616e2f2 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 9e26001 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
changed the title
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.
Merge upstream changes up to 3f68875
Conflicts
app/javascript/entrypoints/common.js:Upstream moved everything from
app/javascript/packstoapp/javascript/entrypointswhile this file was a glitch-soc addition.Moved it like the rest.
tsconfig.json:Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
app/javascript/flavours/vanilla/theme.ymlapp/javascript/flavours/glitch/theme.ymlapp/javascript/flavours/glitch/packsMerge upstream changes up to 85fdbd0
Ported changes
Merge upstream changes up to 7201f99
Ported changes
Merge upstream changes up to f0c9cba
Ported changes
Merge upstream changes up to d97d31c
Conflicts
app/models/account.rb:Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
app/views/settings/profiles/show.html.hamlspec/requests/api/v1/accounts/credentials_spec.rbPorted changes
Merge upstream changes up to b790222
Conflicts
spec/validators/status_length_validator_spec.rb:Upstream refactored tests to stub
StatusLengthValidator::MAX_CHARSwhile glitch-soc had custom code to read fromMAX_TOOT_CHARS.Switched to using upstream's implementation of the tests.
Ported changes