Sync with upstream (Jan 9, 2025) #319
Merged
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
…uilt-in to debian bookwarm It's nodejs 18.13.0
Some of the attributes changed with bootstrap 5. Also removed the redundant screen reader label (it's already present in the aria-label attribute and was showing on screens)
The GitHub link was placed in a way that interacted weirdly with the nav bar toggle and used an outdated href. Also, the navbar was using a light theme, so it didn't show up well.
Resolves an issue with rexml dependency during bundling
BryanQuigley
approved these changes
Jan 9, 2025
|
@BryanQuigley maybe |
|
You are correct, I wonder when thatbroke |
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.
Okay folks, so we have gotten ourselves into a bit of a mess with diverging histories from upstream. This is made a bit more challenging because we're no longer technically a fork of JKAN on GitHub, so we can't use any of GitHub's tooling to sync up.
I'll leave the branch up until this PR is merged so you can see for yourself, but for posterity, this is what the result of a rebase looked like when i tried in July (sorry for taking so long to get back to this 😅):
Many of the new "changes" seem to just be files and lines we already have, so not sure what happened there.
Then i tried merging and resolving the conflicts, but this felt like an error prone process, and confusingly that PR wouldn't merge unless i squashed all of the commits. The whole PR was starting to feel like no matter what it would make our history much messier. See here.
So this morning i decided to just go through and cherry-pick the specific commits from upstream and resolve a couple issues that came up in the process. I'm going to make a separate upstream PR when i have time to make sure that jkan isn't missing any important improvements from our end, but that's the excruciatingly long story behind this little set of changes.