Merge upstream changes up to 01b6c83c369061c2175d50dfb3ae1db502862664 #2573
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: GitHub Actions <[email protected]>
…ogged post author (mastodon#18482) Co-authored-by: Claire <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…8727) 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: Matt Jankowski <[email protected]>
…oc/merge-upstream
…oc/merge-upstream Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.
…oc/merge-upstream
Port 608f66f to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
…ight 400 icons Port 6bbcd93 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
…oc/merge-upstream Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.
ClearlyClaire
changed the title
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #2573 +/- ##
==========================================
+ Coverage 84.72% 84.74% +0.02%
==========================================
Files 1045 1045
Lines 28633 28653 +20
Branches 4645 4640 -5
==========================================
+ Hits 24258 24283 +25
Misses 3173 3173
+ Partials 1202 1197 -5 ☔ View full report in Codecov by Sentry. |
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
dbd26b0 to
34c9f77
Compare
ClearlyClaire
changed the title
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
… it where possible Port 01b6c83 to glitch-soc 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 a906960
No conflicts nor anything to port.
Merge upstream changes up to c6684aa
Conflicts
app/views/layouts/application.html.haml:Upstream changed how the
inert.cssfile is included.The conflict is caused by glitch-soc's theming system.
Ported the upstream change.
Additional changes
config/webpack/shared.js: bypass glitch-soc's theming system forinertpack.Merge upstream changes up to 1070804
Ported changes
Merge upstream changes up to a2f02a0
Ported changes
Merge upstream changes up to 98b5f85
No conflicts nor anything to port
Additional changes
Merge upstream changes up to 7f471e7
Conflicts
app/views/layouts/mailer.html.haml:Conflict caused by glitch-soc's theming system.
Used glitch-soc's path for the mailer pack.
Additional changes
Merge upstream changes up to b4c3321
No conflicts nor anything to port
Merge upstream changes up to 01b6c83
Ported changes