Skip to content

merge queue: embarking main (8d792eb), #952 and #954 together #955

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.

Sign up for GitHub

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

Closed
mergify wants to merge 4 commits into from
Closed

merge queue: embarking main (8d792eb), #952 and #954 together #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed83d73
chore(deps): bump the ruby group with 3 updates
dependabot[bot] Sep 22, 2025
9dc8367
chore(deps): bump the npm group with 2 updates
dependabot[bot] Sep 22, 2025
632cc6c
Merge of #952
mergify[bot] Sep 22, 2025
977d24b
Merge of #954
mergify[bot] Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
GIT
remote: https://github.com/html2rss/html2rss-configs.git
revision: c8799e7f19b12913986b1cf7e534b6d0c145c62a
revision: d6d45eea7005decad6007b56f838d42141b6ec96
specs:
html2rss-configs (0.2.0)
html2rss

GIT
remote: https://github.com/html2rss/html2rss.git
revision: 252289759287d5f0d7251a958d12a72ceebc27d6
revision: 29660a74c2ac9330f60a99a1670241dde32a7222
specs:
html2rss (0.17.0)
addressable (~> 2.7)
Expand Down Expand Up @@ -79,7 +79,7 @@ GEM
faraday (>= 1, < 3)
faraday-net_http (3.4.1)
net-http (>= 0.5.0)
json (2.13.2)
json (2.14.1)
kramdown (2.5.1)
rexml (>= 3.3.9)
logger (1.7.0)
Expand Down
14 changes: 8 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"dependencies": {
"@astrojs/sitemap": "^3.6.0",
"@astrojs/starlight": "^0.35.3",
"astro": "^5.13.8",
"@astrojs/starlight": "^0.36.0",
"astro": "^5.13.9",
"sharp": "^0.34.4"
},
"devDependencies": {
Expand Down