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

[11.0][MIG] mail_optional_autofollow #212

Merged
merged 16 commits into from
Nov 29, 2018

Conversation

damcar
Copy link
Contributor

@damcar damcar commented Nov 15, 2017

No description provided.

@damcar damcar changed the title [11.0][MIG] optional autofollow [11.0][MIG] mail_optional_autofollow Nov 15, 2017
@pedrobaeza pedrobaeza mentioned this pull request Nov 15, 2017
26 tasks
@yajo yajo added this to the 11.0 milestone Nov 16, 2017
mail_optional_autofollow/README.rst Outdated Show resolved Hide resolved
mail_optional_autofollow/README.rst Outdated Show resolved Hide resolved
Copy link
Sponsor Member

@JordiBForgeFlow JordiBForgeFlow left a comment

Choose a reason for hiding this comment

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

You are missing one commit from v10. See f684fdf

Are you still actively working on this? Otherwise we can just merge from #251

mail_optional_autofollow/__init__.py Outdated Show resolved Hide resolved
mail_optional_autofollow/__manifest__.py Outdated Show resolved Hide resolved
@damcar
Copy link
Contributor Author

damcar commented Aug 29, 2018

@jbeficent @yajo it's ok for merged ?

Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

Code OK.

Please squash all migration-related commits to merge.

@hbrunn
Copy link
Member

hbrunn commented Nov 29, 2018

as @jbeficent's comments seem to be fixed, I'll merge

@hbrunn hbrunn merged commit 4eb9b59 into OCA:11.0 Nov 29, 2018
@pedrobaeza
Copy link
Member

Well, there's a lot of commit noise, so next time you can use your super-powers for squashing selectively them before merging.

@hbrunn
Copy link
Member

hbrunn commented Nov 29, 2018

is there a convenient way to do this without checking out locally, doing the rebase there and force pushing?

@pedrobaeza
Copy link
Member

I'm afraid not. I do it locally, but I agree it's not the more comfortable thing to do. I have taught all my colleagues now to do forced push when changing PRs as GitHub has included the option to see the diff when you do this operation, so no extra action is required when merging.

@hbrunn
Copy link
Member

hbrunn commented Nov 29, 2018

hmmm, okay, thanks. So I'll keep asking people to squash themselves, I always dislike it when my signature is squashed away.

@pedrobaeza
Copy link
Member

Yeah, that's another thing when manipulating commits... 😢

I think we can start to ask to forced push in the PRs instead.

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.

None yet