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

[FW][FIX] odoo_theme: re-enable redirect fallback logic #3298

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 5, 2023

Forward-Port-Of: #3297
Forward-Port-Of: #3292

@robodoo
Copy link
Collaborator

robodoo commented Jan 5, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 5, 2023

@AntoineVDV cherrypicking of pull request #3292 failed.

stdout:

Auto-merging extensions/odoo_theme/static/js/switchers.js
CONFLICT (content): Merge conflict in extensions/odoo_theme/static/js/switchers.js

stderr:

14:09:08.442284 git.c:455               trace: built-in: git cherry-pick f3156d8b745e8e4516e7bac46f6a4008b233cb5d
error: could not apply f3156d8b... [FIX] odoo_theme: re-enable redirect fallback logic
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.

@AntoineVDV AntoineVDV force-pushed the saas-15.3-14.0-fix-redirect-anv-2EfH-fw branch from 269d96b to 36b4932 Compare January 5, 2023 14:57
@AntoineVDV
Copy link
Collaborator

@robodoo r+

@C3POdoo C3POdoo requested review from a team January 5, 2023 14:59
@AntoineVDV AntoineVDV removed request for a team January 5, 2023 15:00
robodoo pushed a commit that referenced this pull request Jan 5, 2023
closes #3298

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
@robodoo robodoo temporarily deployed to merge January 5, 2023 16:37 Inactive
@robodoo robodoo closed this Jan 5, 2023
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.

None yet

3 participants