Merge upstream (July 2nd, 2024) #251
Closed
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
- repository added to config - moved from Jekyll image to Dockerfile based on Ruby image
Also remove unneeded lines from docker-compose. Related: #254
- Items that have been replaced - New items included
Dropped jekyll-npm mentioning and fixing up container workflow. Also added newer version of node/npm from suggestion. Drop hadolint check as well.
Fixes include: - Jumbotron - List Groups
badge-pill -> rounded-pill badge-* -> bg-* float-right -> float-end
Bootstrap v5 removed background from breadcrumbs by default
…strap-v5 Upgrade to bootstrap v5
* Drop old Add-categories linl * UI: Sidebar: Increase spacing between Categories and Organizations * The original suggestion was Change count pill for selected category and X button to white background with Tim's suggestion moved to bg-light text-dark. Also changed in datasets.html to use primary blue. * UI: Results: Increase spacing to make list more legible. I just added top spacing to datasets to the separator is more in the middle.
Fixes and adds hover effect to categories grid, changes button copy
Homepage tweaks
Version 2.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)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.14.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.13.9...v1.14.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.23.6 to 0.23.9. - [Release notes](https://github.com/gjtorikian/commonmarker/releases) - [Changelog](https://github.com/gjtorikian/commonmarker/blob/main/CHANGELOG.md) - [Commits](gjtorikian/commonmarker@v0.23.6...v0.23.9) --- updated-dependencies: - dependency-name: commonmarker dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [activesupport](https://github.com/rails/rails) from 6.0.6 to 6.0.6.1. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.4.2/activesupport/CHANGELOG.md) - [Commits](rails/rails@v6.0.6...v6.0.6.1) --- updated-dependencies: - dependency-name: activesupport dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Also updated bundler and ruby versions in Docker. Had to go through several iterations to get GitHub-metadata to work, as part of that: * Dropped Open in GitHub button from categories page as we don't generally want edits there. * GitHub edit link didn't work initially so reverted pending fix for jekyll/github-metadata#249.
These were included as part of GH pages in 3.9.
Require yaml parsing for build, builds will fail if yaml isn't correct. switch to faster megalinter which should make it easier to do more future tests included some yaml prettier changes Resolves: #276
Aside from letting us drop the legacy build it also let's us drop the jquery-deparam dependency replacing with built-in urlSearchParams
…uilt-in to debian bookwarm It's nodejs 18.13.0
Credit to @adamdmharvey from opendataphilly contribution
This is mostly just adding markdownify around the notes/descriptions, but also * Removes edit/open in GitHub from the categories page * Adds a new Sample dataset for OpenDataPhilly. Figured extra sample files could just be other JKAN instances. This one test the use of markdown. * Added small amount of markdown to default sample org so we can see if it works there.
This just got screwed up during the merge
|
I swear it was saying it was fine a second ago :/ |
|
i'll come back to this asap and figure out where things got screwed up
|
|
@BryanQuigley i'm going to update this tomorrow then if it looks good we can just squash it |
|
Closing in favor of #319 |
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.
i was going to rebase this instead of merging, but doing so led to a ton of file changes and duplicate commits that don't make sense to me, e.g. CODEOWNERS already looks like that on main. @BryanQuigley let me know if you have any insights here