Skip to content

[13.0][MIG] document_page_environment_manual #324

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

Merged

Conversation

flachica
Copy link
Contributor

@flachica flachica commented Apr 2, 2020

Many conflicts on git format-patch. This PR solve #302 problems

@flachica flachica mentioned this pull request Apr 2, 2020
21 tasks
@dreispt dreispt added this to the 13.0 milestone Apr 3, 2020
@Rad0van
Copy link
Contributor

Rad0van commented May 21, 2020

When will this be merged? #303 is failing on this being missing. I can volunteer to do some stuff if needed.

@flachica
Copy link
Contributor Author

I have migrated all the modules I was missing to version 13.0. Use this repository https://github.com/flachica/management-system and the branchs in case it helps you. On some occasion I had problems with the git rebase but all the code is working in my test environment

@Rad0van
Copy link
Contributor

Rad0van commented May 21, 2020

I have migrated all the modules I was missing to version 13.0. Use this repository https://github.com/flachica/management-system and the branchs in case it helps you. On some occasion I had problems with the git rebase but all the code is working in my test environment

Thanx for info. I'll wait a bit I guess to see if this gets going on.

@ivantodorovich
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 13.0-ocabot-merge-pr-324-by-ivantodorovich-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request May 21, 2020
Signed-off-by ivantodorovich
@OCA-git-bot
Copy link
Contributor

@ivantodorovich your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-324-by-ivantodorovich-bump-nobump.

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.

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

@flachica flachica force-pushed the 13.0-mig-document_page_environment_manual branch from e6bd9cc to 9f5ab79 Compare May 21, 2020 14:32
@flachica
Copy link
Contributor Author

@ivantodorovich your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-324-by-ivantodorovich-bump-nobump.

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.

@ivantodorovich This error is new for me. Flake8 don't understand a correct sentence in my opinion

@ivantodorovich
Copy link
Contributor

ivantodorovich commented May 21, 2020 via email

@flachica
Copy link
Contributor Author

@ivantodorovich Of course, the rebase was initiated 15 minutes ago here

@Rad0van
Copy link
Contributor

Rad0van commented Jun 1, 2020

@ivantodorovich Of course, the rebase was initiated 15 minutes ago here

How is this going? Can I help with anything?

@ivantodorovich
Copy link
Contributor

All clear, just please squash Flake8 error commit into the Migration to 13.0 commit, and that's it :)

@Rad0van
Copy link
Contributor

Rad0van commented Jun 8, 2020

I guess only @flachica can do that, right?

@flachica flachica force-pushed the 13.0-mig-document_page_environment_manual branch from 9f5ab79 to 8a61469 Compare June 9, 2020 06:27
@flachica
Copy link
Contributor Author

flachica commented Jun 9, 2020

@Rad0van @ivantodorovich It is done

@Rad0van
Copy link
Contributor

Rad0van commented Jun 9, 2020

@Rad0van @ivantodorovich It is done

Fantastic! Thank you. Will this be merged automatically or someone has to to sign it off?
Now we can progress with #303

@ivantodorovich
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 13.0-ocabot-merge-pr-324-by-ivantodorovich-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 9ee0d97 into OCA:13.0 Jun 9, 2020
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 2d4685f. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants