search

OCA / server-env

Tools to manage environment-dependent configuration
GNU Affero General Public License v3.0
57 stars 162 forks source link

[17.0][MIG] data_encryption: Migration to 17.0 #198

Closed map-240221 closed 1 week ago

mkrnac commented 1 month ago

when this PR can be merged?

pedrobaeza commented 1 month ago

It requires reviews: https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#review

map-240221 commented 1 month ago

Squashed the commits into one

florian-dacosta commented 1 month ago

Thanks

@moitabenfdz @bguillot Could you review please?

hparfr commented 1 month ago

please remove the pandoc file

map-240221 commented 1 month ago

pandoc-3.3-1-amd64.deb is in "[IMP] data_encryption: pre-commit auto fixes" commit

Removed and changes squashed into the last commit

pedrobaeza commented 1 month ago

That's not correct, as it was introduced in the commit "[IMP] data_encryption: pre-commit auto fixes", so you have the double diff, adding and removing it. You must do it in the previous commit.

map-240221 commented 1 month ago

Thanks for the correction. Rebased the last two commits and made the changes in the designated commit, hopefully no more technical (non-functionality) issues.

pedrobaeza commented 1 month ago

Yes, that part is correct.

OCA-git-bot commented 1 month ago

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

hparfr commented 1 month ago

Thanks @map-240221

bguillot commented 1 week ago

/ocabot merge nobump

OCA-git-bot commented 1 week ago

What a great day to merge this nice PR. Let's do it! Prepared branch 17.0-ocabot-merge-pr-198-by-bguillot-bump-nobump, awaiting test results.

OCA-git-bot commented 1 week ago

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