Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 8, 2022

Cherry pick of #2485 ( which is a cherry pick of #1560 ) to re-target base to 14.0.

Adds note warning users they need at least one app installed to be able to see the 'enable dev mode' option. Took me a while to figure this out as it doesn't seem to be mentioned anywhere (in these docs or in the Development Environment Set-uparticle).

Forward-Port-Of: #3140

@robodoo
Copy link
Collaborator

robodoo commented Dec 8, 2022

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 8, 2022

@samueljlieber @AntoineVDV cherrypicking of pull request #3140 failed.

stdout:

Auto-merging content/applications/general/developer_mode.rst
CONFLICT (content): Merge conflict in content/applications/general/developer_mode.rst

stderr:

11:28:01.761669 git.c:455               trace: built-in: git cherry-pick 31a774ac8563e3db14c6acc3b6f645d1a422c700
error: could not apply 31a774ac... [IMP] general: add notes about dev mode toggle
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.

@samueljlieber samueljlieber force-pushed the 15.0-14.0-general-add-notes-about-dev-mode-toggle-tiku-wZvS-fw branch from ea10093 to 4eaf457 Compare December 13, 2022 18:52
@C3POdoo C3POdoo requested a review from a team December 13, 2022 18:53
@samueljlieber
Copy link
Contributor

samueljlieber commented Dec 13, 2022

4eaf457 fixed merge conflict in developer_mode.rst and manually rebased to 15.0.

Accepted the current change to lines 76-79 (:ref:s to assets debug mode & test debug mode that only exist in 15.0 & 16.0).

@StraubCreative
Copy link
Contributor

@AntoineVDV we had to make slight adjustment to this forward-port since a block of content between versions 14 vs 15+ are different.

Changes LGTM— requesting your review for merge, ty!

@AntoineVDV
Copy link
Collaborator

@StraubCreative For minor adaptations like this, you can go ahead and merge without review. The codeowners are assigned on fwp PRs that are force-pushed just in case there is a substantial adaptation to review or just to let them know that some adaptation was required.

Authors receive r+ rights on their fwp PRs so @samueljlieber could have replied with robodoo r+ after force-pushing ;)

@robodoo r+

@robodoo
Copy link
Collaborator

robodoo commented Dec 14, 2022

@samueljlieber @AntoineVDV staging failed: ci/runbot on 79bd996a3da14ad96099487463808c828c8b3949 (view more at https://runbot.odoo.com/runbot/build/21869735)

@AntoineVDV
Copy link
Collaborator

@robodoo retry

robodoo pushed a commit that referenced this pull request Dec 15, 2022
closes #3143

X-original-commit: dc3d43c
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
@robodoo robodoo temporarily deployed to merge December 15, 2022 17:50 Inactive
@robodoo robodoo closed this Dec 15, 2022
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.

6 participants