Merge upstream changes up to 0a7cff53c2577b3e79599e069eeb344f2613ad8d #2562
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: 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>
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: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.
…oc/merge-upstream Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.
…oc/merge-upstream
Codecov ReportAttention:
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #2562 +/- ##
==========================================
+ Coverage 84.66% 84.70% +0.04%
==========================================
Files 1046 1045 -1
Lines 28653 28608 -45
Branches 4650 4642 -8
==========================================
- Hits 24259 24233 -26
+ Misses 3199 3174 -25
- Partials 1195 1201 +6 ☔ View full report in Codecov by Sentry. |
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 9a73a7d
No conflicts nor anything to port.
Merge upstream changes up to 36b46ea
Conflicts
app/views/settings/preferences/appearance/show.html.haml:Conflict because of a code style fix, while some changed lines are absent from glitch-soc.
Ignored the deleted lines.
Additional changes
Merge upstream changes up to 0a7cff5
No conflicts nor anything to port.
Additional changes