Skip to content

Merge release/17.9 into dev - #26304

Merged
myabc merged 4 commits into
devfrom
merge-release/17.9-20261025210926
Oct 25, 2026
Merged

myabc merged 4 commits into
devfrom
merge-release/17.9-20261025210926

Conversation

@openprojectci

Copy link
Copy Markdown
Contributor

Created by GitHub action

oliverguenther and others added 3 commits October 25, 2026 22:02
* Bump ruby to 4.0.9

* Bump setup-ruby to find 4.0.9

* Fix outdated ruby comment in AGENTS.md
* Run npm audit fix

* Extend npm audit workflow for extensions
@openprojectci openprojectci added the create-merge-release-into-dev-pr Mark auto created PRs that will be auto closed too label Oct 25, 2026
@myabc myabc self-assigned this Oct 25, 2026
# Conflicts:
#	.github/workflows/brakeman-scan-core.yml
#	.github/workflows/crowdin.yml
#	.github/workflows/danger.yml
#	.github/workflows/docs.yaml
#	.github/workflows/erb-lint-core.yml
#	.github/workflows/i18n-tasks.yml
#	.github/workflows/openapi.yaml
#	.github/workflows/rubocop-core.yml
#	.github/workflows/seed-all-locales.yml
#	.github/workflows/work-package-check.yml
#	.ruby-version
#	AGENTS.md
#	Gemfile.lock
#	docker/dev/backend/Dockerfile
#	docker/prod/Dockerfile
#	docs/development/development-environment/linux/README.md
#	docs/development/development-environment/macos/README.md
#	docs/installation-and-operations/installation/manual/README.md
#	extensions/op-blocknote-hocuspocus/package-lock.json
#	frontend/package-lock.json
#	frontend/package.json
@myabc
myabc requested a review from oliverguenther October 25, 2026 21:21
@myabc
myabc enabled auto-merge October 25, 2026 21:37
@myabc
myabc self-requested a review October 25, 2026 21:39
@myabc
myabc merged commit 71a8a3f into dev Oct 25, 2026
27 checks passed
@myabc
myabc deleted the merge-release/17.9-20261025210926 branch October 25, 2026 21:39
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 25, 2026
@myabc

myabc commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

@oliverguenther actually I'm confident enough in the conflict resolution to go ahead and merge.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

create-merge-release-into-dev-pr Mark auto created PRs that will be auto closed too

Development

Successfully merging this pull request may close these issues.

3 participants