Skip to content

[10.0][FIX] issue 1227. auth_admin_passkey. Error on editing general settings.#1720

Merged
OCA-git-bot merged 2 commits intoOCA:10.0from
NL66278:10.0-auth_admin_passkey-issue-1227
Jun 18, 2020
Merged

[10.0][FIX] issue 1227. auth_admin_passkey. Error on editing general settings.#1720
OCA-git-bot merged 2 commits intoOCA:10.0from
NL66278:10.0-auth_admin_passkey-issue-1227

Conversation

@NL66278
Copy link
Contributor

@NL66278 NL66278 commented Nov 6, 2019

This is an alternative for the stale PR: #1228

@NL66278 NL66278 force-pushed the 10.0-auth_admin_passkey-issue-1227 branch 3 times, most recently from 0aeac14 to 6d9a8c1 Compare November 6, 2019 14:55
@NL66278 NL66278 force-pushed the 10.0-auth_admin_passkey-issue-1227 branch from 6d9a8c1 to ba5c6b0 Compare November 6, 2019 15:40
legalsylvain
legalsylvain approved these changes Nov 12, 2019
View reviewed changes
Copy link
Contributor

@legalsylvain legalsylvain left a comment

Choose a reason for hiding this comment

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

Lgtm. Code review. No test. Thanks.

@gurneyalex gurneyalex mentioned this pull request Dec 12, 2019
Closed
@gurneyalex
Copy link
Member

gurneyalex commented Dec 12, 2019

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Dec 12, 2019

On my way to merge this fine PR!
Prepared branch 10.0-ocabot-merge-pr-1720-by-gurneyalex-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 12, 2019
@OCA-git-bot
Merge PR #1720 into 10.0
0deb0ec 
Signed-off-by gurneyalex
@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Dec 12, 2019

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

@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Dec 12, 2019

@gurneyalex your merge command was aborted due to failed check(s), which you can inspect on this commit of 10.0-ocabot-merge-pr-1720-by-gurneyalex-bump-patch.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@dreispt
Copy link
Member

dreispt commented Jun 17, 2020

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Jun 17, 2020

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 10.0-ocabot-merge-pr-1720-by-dreispt-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 17, 2020
@OCA-git-bot
Merge PR #1720 into 10.0
d70cda4 
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Jun 17, 2020

It looks like something changed on 10.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 10.0-ocabot-merge-pr-1720-by-dreispt-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit ec5d4d8 into OCA:10.0 Jun 18, 2020
@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Jun 18, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gurneyalex gurneyalex gurneyalex approved these changes

@legalsylvain legalsylvain legalsylvain approved these changes

Assignees

No one assigned

Labels

approved merged 🎉 ready to merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@NL66278 @gurneyalex @OCA-git-bot @dreispt @legalsylvain