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

Jump to bottom

[14.0] Add storage of context in jobs recordsets #433

Merged
merged 2 commits into from May 30, 2022
Merged

[14.0] Add storage of context in jobs recordsets #433

merged 2 commits into from May 30, 2022

Conversation

AshishHirapara
Copy link

@AshishHirapara AshishHirapara commented May 24, 2022 •
edited

This is the migration of the PR #432 (by @guewen) to 14.0

@OCA-git-bot
Copy link
Contributor

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

guewen
guewen approved these changes May 24, 2022
View reviewed changes
Copy link
Member

@guewen guewen left a comment

Choose a reason for hiding this comment

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

Thank you!

@AshishHirapara AshishHirapara mentioned this pull request May 24, 2022
Merged
GSLabIt
GSLabIt approved these changes May 24, 2022
View reviewed changes
Copy link

@GSLabIt GSLabIt left a comment

Choose a reason for hiding this comment

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

LGTM

simahawk
simahawk requested changes May 24, 2022
View reviewed changes
Copy link
Contributor

@simahawk simahawk left a comment

Choose a reason for hiding this comment

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

wait, commits are not the same. How are you picking the changes?

@AshishHirapara
Copy link
Author

@simahawk what do you mean by commits are not the same? Please elaborate more.

@simahawk
Copy link
Contributor

simahawk commented May 25, 2022 •
edited

The way to port changes from versions to versions is to use cherry-pick or to use format-patch (see https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-14.0).
Here you are creating completely new commits which lose the original author and make back/forward porting harder because the message is different (and it will be harder to detect which commits to port).

Easy option:

  1. switch to your branch
  2. git reset --hard on OCA/14.0
  3. git log -10 OCA/13.0 (adjust the number to find the commits)
  4. git cherry-pick $commit1
  5. git cherry-pick $commit2

@AshishHirapara
Copy link
Author

@simahawk got it, I will update it soon.

@simahawk
Copy link
Contributor

as you prefer

@OCA-git-bot
Copy link
Contributor

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

@AshishHirapara AshishHirapara changed the title [14.0][UPD] queue_job: migration of PR#432 [14.0] Add storage of context in jobs recordsets May 30, 2022
@AshishHirapara AshishHirapara force-pushed the 14.0-queue_job-store_context branch 4 times, most recently from 4e3250d to 9691634 Compare May 30, 2022 13:09
simahawk
simahawk reviewed May 30, 2022
View reviewed changes
queue_job/models/base.py Outdated Show resolved Hide resolved
@guewen @AshishHirapara
Disable storing of context in jobs recordsets by default
8f1f9de 
It can still be activated by overriding a method.
simahawk
simahawk approved these changes May 30, 2022
View reviewed changes
Copy link
Contributor

@simahawk simahawk left a comment

Choose a reason for hiding this comment

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

LG

@simahawk
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 14.0-ocabot-merge-pr-433-by-simahawk-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit e5fb2c0 into OCA:14.0 May 30, 2022
@OCA-git-bot
Copy link
Contributor

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

@hoangtrann hoangtrann mentioned this pull request Oct 18, 2022
Merged
@sbidoul sbidoul mentioned this pull request Oct 20, 2022
Merged
@baimont baimont mentioned this pull request Oct 20, 2022
Merged
This was referenced Feb 28, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simahawk simahawk simahawk approved these changes

@guewen guewen guewen approved these changes

@GSLabIt GSLabIt GSLabIt approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@AshishHirapara @OCA-git-bot @simahawk @guewen @GSLabIt