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

[18.0][REF] Forward port from 17.0 #732

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Conversation

florentx
Copy link
Contributor

Only minor divergence

@OCA-git-bot
Copy link
Contributor

Hi @guewen,
some modules you are maintaining are being modified, check this out!

Copy link
Contributor

@amh-mw amh-mw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@florentx
Copy link
Contributor Author

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.
These are only minor fixes, and I've packed them in a single commit for simplicity.
I am author of the fixes ported from the other branch to 18.0.

Copy link
Contributor

@sebalix sebalix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

@sebalix
Copy link
Contributor

sebalix commented Jan 13, 2025

I did an attempt here from 14.0 to 18.0 for instance:

Copy link
Contributor

@sebalix sebalix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer to block this PR, as stated history needs to be preserved.

lmignon and others added 3 commits January 13, 2025 14:56
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
@florentx
Copy link
Contributor Author

History restored, as suggested.

@simahawk
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 18.0-ocabot-merge-pr-732-by-simahawk-bump-minor, awaiting test results.

@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at ff7c9fe. Thanks a lot for contributing to OCA. ❤️

@OCA-git-bot OCA-git-bot merged commit bb05de3 into OCA:18.0 Jan 16, 2025
6 of 7 checks passed
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.

9 participants