Skip to content

[IMP] website: update form protection page#17332

Closed
fw-bot wants to merge 1 commit into18.0from
18.0-17.0-website-spam-protection-lman-515382-fw
Closed

[IMP] website: update form protection page#17332
fw-bot wants to merge 1 commit into18.0from
18.0-17.0-website-spam-protection-lman-515382-fw

Conversation

@fw-bot
Copy link
Copy Markdown
Collaborator

@fw-bot fw-bot commented Apr 10, 2026

task-5409890

Forward-Port-Of: #17298

@robodoo
Copy link
Copy Markdown
Collaborator

robodoo commented Apr 10, 2026

Pull request status dashboard

@fw-bot
Copy link
Copy Markdown
Collaborator Author

fw-bot commented Apr 10, 2026

@lman-odoo @auva-odoo cherrypicking of pull request #17298 failed.

stdout:

Auto-merging content/applications/websites/website/configuration/spam_protection.rst
CONFLICT (content): Merge conflict in content/applications/websites/website/configuration/spam_protection.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@lman-odoo lman-odoo force-pushed the 18.0-17.0-website-spam-protection-lman-515382-fw branch from 031c7b1 to 392c721 Compare April 10, 2026 12:45
@C3POdoo C3POdoo requested a review from a team April 10, 2026 12:49
@lman-odoo
Copy link
Copy Markdown
Contributor

@robodoo r+

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants