8000 [FW][IMP] website: warn about privacy regulations for recaptcha and gtm by fw-bot · Pull Request #9154 · odoo/documentation · GitHub
[go: up one dir, main page]
Skip to content

[FW][IMP] website: warn about privacy regulations for recaptcha and gtm #9154

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[FW][IMP] website: warn about privacy regulations for recaptcha and gtm #9154

wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator
@fw-bot fw-bot commented May 3, 2024

task-3896553
task-3896425

Forward-Port-Of: #9145

@robodoo
Copy link
Collaborator
robodoo commented May 3, 2024

Pull request status dashboard.

@fw-bot fw-bot mentioned this pull request May 3, 2024
Closed
@fw-bot
Copy link
Collaborator Author
fw-bot commented May 3, 2024

@xpl-odoo cherrypicking of pull request #9145 failed.

stdout:

CONFLICT (modify/delete): content/applications/websites/website/configuration/recaptcha.rst deleted in HEAD and modified in a922f3eea ([IMP] website: warn about privacy regulations for recaptcha and gtm).  Version a922f3eea ([IMP] website: warn about privacy regulations for recaptcha and gtm) of content/applications/websites/website/configuration/recaptcha.rst left in tree.

stderr:

17:45:36.493702 git.c:463               trace: built-in: git cherry-pick a922f3eea4f74ff99a1c7e37531f1a9ae7f7dc89
error: could not apply a922f3eea... [IMP] website: warn about privacy regulations for recaptcha and gtm
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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

In the former case, you may want to edit this PR message as well.

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

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

@xpl-odoo xpl-odoo force-pushed the saas-16.3-15.0-website-recaptcha-gtm-privacy-xpl-m8Kt-fw branch from 70d0b47 to eee7d4c Compare May 6, 2024 08:45
@C3POdoo C3POdoo requested a review from a team May 6, 2024 08:49
@xpl-odoo
Copy link
Contributor
xpl-odoo commented May 6, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request May 6, 2024
@xpl-odoo
[IMP] website: warn about privacy regulations for recaptcha and gtm
79b383d 
task-3896553
task-3896425

closes #9154

X-original-commit: 76b6dd3
Signed-off-by: Xavier Platteau (xpl) <xpl@odoo.com>
@robodoo robodoo closed this May 6, 2024
This was referenced May 6, 2024
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflict forwardport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fw-bot @robodoo @xpl-odoo
0