Merge upstream changes up to 0226bbe5165a53658b29e46ddbef6a10507fdc8c #2843
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: 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]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
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>
…oc/merge-upstream
Port e09f9f8 to glitch-soc Signed-off-by: Claire <[email protected]>
Port a3215c0 to glitch-soc Signed-off-by: Claire <[email protected]>
Port a27f7f4 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 f2a92c2 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did.
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
78926c0
to
5752c49
Compare
Port 3d46f47 to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>
Port 24ef825 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
73cb02b
to
bd68d2a
Compare
…oc/merge-upstream
ClearlyClaire
changed the title
Port 5f782f9 to glitch-soc Signed-off-by: Claire <[email protected]>
Port a269ff9 to glitch-soc Signed-off-by: Claire <[email protected]>
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 a27f7f4
Ported changes
Merge upstream changes up to f2a92c2
Ported changes
Merge upstream changes up to 3d46f47
Conflicts
app/helpers/accounts_helper.rb:Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
app/views/layouts/embedded.html.haml:Conflicts due to theming system.
Adapted upstream's change to our theming system.
app/views/statuses/_simple_status.html.haml:Removed upstream, but we had local changes.
Removed as upstream did.
Ported changes
Merge upstream changes up to 0226bbe
Ported changes
Additional changes