Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main rebase unique branch name 23 10 #106

Merged
merged 12 commits into from
Oct 24, 2023

Conversation

BryanQuigley
Copy link
Member

@BryanQuigley BryanQuigley commented Oct 8, 2023

Closes: #105

dependabot bot and others added 12 commits October 10, 2023 20:56
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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
Works around jekyll/github-metadata#249

Only kept Edit on Github link for datasets as the others will
not be as common.

Moved Open in Github link so it's clearly more related to the dataset
instead of the org sidebar.

Resolves: #31, #37
Don't check python files
Fix line in yml and bump ruby action
@BryanQuigley BryanQuigley force-pushed the main_rebase_unique_branch_name_23_10 branch from 06694eb to f676c1b Compare October 11, 2023 03:56
@BryanQuigley
Copy link
Member Author

Ready for review - synced with upstream

Copy link
Collaborator

@lydiascarf lydiascarf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! runs alright too :)

@BryanQuigley BryanQuigley merged commit a768e6b into main Oct 24, 2023
3 checks passed
@BryanQuigley BryanQuigley deleted the main_rebase_unique_branch_name_23_10 branch October 24, 2023 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rebase to upstream 23-10
3 participants