Merge upstream changes up to c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0 #2834
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>
…oc/merge-upstream Conflicts: - `spec/requests/api/v1/timelines/tag_spec.rb`: Upstream refactored this file, while we had a change to switch a default setting. Updated as upstream did. - `spec/views/statuses/show.html.haml_spec.rb`: Upstream refactored this file, while we stubbed different methods. Updated as upstream did, and updated the stubs accordingly.
Port 0437dd9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 8adf67f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
Conflicts
spec/requests/api/v1/timelines/tag_spec.rb:Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
spec/views/statuses/show.html.haml_spec.rb:Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
Ported changes