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.

Sign up for GitHub

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

[12.0][MIG] Migrate base_suspend_security #31

Merged
merged 15 commits into from
Feb 21, 2019
Merged

[12.0][MIG] Migrate base_suspend_security #31

merged 15 commits into from
Feb 21, 2019

Conversation

RobinetDenisAcsone
Copy link

Summary of changes:

  • README fragments
  • version number

@RobinetDenisAcsone
Copy link
Author

Travis is red because of the readme of base_user_role, fixed in #23

@pedrobaeza pedrobaeza added this to the 12.0 milestone Feb 11, 2019
@OCA-git-bot OCA-git-bot mentioned this pull request Feb 11, 2019
Closed
9 tasks
@ThomasBinsfeld
Copy link

@RobinetDenisAcsone This one can be rebased.

@RobinetDenisAcsone RobinetDenisAcsone mentioned this pull request Feb 15, 2019
Closed
1 task
hbrunn
hbrunn approved these changes Feb 15, 2019
View reviewed changes
Copy link
Member

@hbrunn hbrunn left a comment

Choose a reason for hiding this comment

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

thanks!

base_suspend_security/__init__.py Outdated Show resolved Hide resolved
@pedrobaeza
Copy link
Member

You should take into account 4ee3ee6 that I was forced to put directly in 11.0 for not breaking totally the service.

@RobinetDenisAcsone
Copy link
Author

@pedrobaeza the _browse change isn't done (yet?) in 12.0 and master

@pedrobaeza
Copy link
Member

Uhm, I see. It's a matter of time then...

@OCA-git-bot
Copy link
Contributor

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). 🤖

@hbrunn
Copy link
Member

hbrunn commented Feb 21, 2019

@RobinetDenisAcsone now the patch has landed. Could you apply @pedrobaeza's commit and then we can merge?

@pedrobaeza @RobinetDenisAcsone
[FIX] base_suspend_security: Adapt to upstream
d3de39f 
On 9af8b31d921dcccb7bcf230271fd3ef4R4329, a new keyword argument was added
for `_browse`, so any overriding needs to add that argument, as it's the case
for this module.
@RobinetDenisAcsone
Copy link
Author

@pedrobaeza @hbrunn commit cherry picked, should be ready to be merged.

@hbrunn hbrunn merged commit 92ebf2d into OCA:12.0 Feb 21, 2019
@RobinetDenisAcsone RobinetDenisAcsone deleted the 12.0-mig-base_suspend_security branch February 21, 2019 14:24
@pedrobaeza
Copy link
Member

@hbrunn please remember to check the line in the migration issue when merging migration PRs. I have done it already for this one.

@hbrunn
Copy link
Member

hbrunn commented Feb 21, 2019

ah, thanks. shouldn't we automate that away?

@pedrobaeza
Copy link
Member

Yes, see OCA/oca-github-bot#32 for one possible specification.

@thomaspaulb thomaspaulb mentioned this pull request Jan 18, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hbrunn hbrunn hbrunn approved these changes

@ThomasBinsfeld ThomasBinsfeld ThomasBinsfeld approved these changes

Assignees
No one assigned
Labels
approved ready to merge
Projects
None yet
Milestone
12.0
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@RobinetDenisAcsone @ThomasBinsfeld @pedrobaeza @OCA-git-bot @hbrunn @sbidoul @adrienpeiffer @lmignon @katyukha @oca-transbot