[pull] main from glitch-soc:main #523
Open
Conversation
This file contains hidden or 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
…oc/merge-upstream
Port 5651900 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4323963 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/views/wrapstodon/show.html.haml`: Conflict because of glitch-soc's theming system. Applied upstream's changes.
Port c06eb37 to glitch-soc Signed-off-by: Claire <[email protected]>
Port dfbf908 to glitch-soc Signed-off-by: Claire <[email protected]>
Merge upstream changes up to d730f6b
…y failure to get remote actor (mastodon#37221)
…oc/merge-upstream
Port 10f232c to glitch-soc Signed-off-by: Claire <[email protected]>
Port 571c93c to glitch-soc Signed-off-by: Claire <[email protected]>
Port e206b0d to glitch-soc Signed-off-by: Claire <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… in status update (mastodon#37436)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ry in FetchResourceService (mastodon#37439) Co-authored-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream refactored a bit where we had an extra argument for markdown/HTML. Adapted upstream change.
Merge upstream changes up to 9b5986b
…oc/main Conflicts: - `app/helpers/theme_helper.rb`: Upstream added a helper to insert javascript tags, close to where we had modified code. Ported upstream's change.
Port be60c45 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4163965 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 122b159 to glitch-soc Signed-off-by: Claire <[email protected]>
Merge upstream changes up to 19bc3e7
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>
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>
…oc/merge-upstream
Merge upstream changes up to 10de65e
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
15 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )