[18.0][REF] Forward port from 17.0#732
Conversation
|
Hi @guewen, |
amh-mw
left a comment
amh-mw
left a comment
There was a problem hiding this comment.
This seems to have lost attribution to the original committer(s)? I don't think that is allowed per AGPL v3 section 7:
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
Well, I'm not sure I understand what it refers to. |
sebalix
left a comment
sebalix
left a comment
There was a problem hiding this comment.
@florentx we should avoid the squash of commits when backporting/forward porting commits from one branch to another, otherwise it is very difficult to list fixes/features that are missing.
I would encourage the use of https://github.com/OCA/oca-port/ to port changes from one branch to another, it compares commits between OCA branches based on several criteria like:
- author
- commit date
- commit message
And from there it regroup missing commits by PRs to better understand what needs to be ported, in the right order to avoid conflicts if possible.
|
I did an attempt here from 14.0 to 18.0 for instance: |
sebalix
left a comment
sebalix
left a comment
There was a problem hiding this comment.
Prefer to block this PR, as stated history needs to be preserved.
By default, odoo never runs the same cron job in parallel. This commit uses the identity key mechanism to enforce this mechanism when a cron job is run as a queue job. This behaviour can be controlled by a new setting on the cron definition but is activated by default to keep the original behaviour
|
History restored, as suggested. |
|
/ocabot merge minor |
|
This PR looks fantastic, let's merge it! |
|
Congratulations, your PR was merged at ff7c9fe. Thanks a lot for contributing to OCA. ❤️ |
9 participants
Only minor divergence