Merge upstream changes up to 7f84bbfd92377689f84121ec45c5b9d809d94cde #2653
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> Co-authored-by: Renaud Chaput <[email protected]>
Co-authored-by: Claire <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
Port 899eac1 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `package.json`: Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one were changed, but otherwise no real conflict. Ported upstream's changes and kept glitch-soc's `i18n:extract`. - `tsconfig.json`: Upstream's dependencies changed the code style rules for json formatting, and we had local changes. Kept our changes, but with upstream's formatting/ - `yarn.lock`: A dependency textually adjacent to a glitch-soc-only one got changed. Applied upstream's change, keeping the glitch-soc-only dependency.
Port dc4427d to glitch-soc Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port edfc538 to glitch-soc Signed-off-by: Claire <[email protected]>
Port deffb8e to glitch-soc Co-authored-by: Claire <[email protected]> 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 899eac1
Conflicts
app/javascript/packs/admin.jsx:Changes split in
app/javascript/core/admin.jsandapp/javascript/flavours/glitch/packs/admin.jsx.Ported changes
Merge upstream changes up to 3b31447
Conflicts
package.json:Conflict due to lines adjacent to the glitch-soc-modified
i18n:extractone were changed, but otherwise no real conflict.Ported upstream's changes and kept glitch-soc's
i18n:extract.tsconfig.json:Upstream's dependencies changed the code style rules for json formatting, and we had local changes.
Kept our changes, but with upstream's formatting/
yarn.lock:A dependency textually adjacent to a glitch-soc-only one got changed.
Applied upstream's change, keeping the glitch-soc-only dependency.
Ported changes
Merge upstream changes up to 7f84bbf
Ported changes