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

[10.0][MIG] attachment_preview migration #199

Closed
wants to merge 2 commits into from

Conversation

tarteo
Copy link
Member

@tarteo tarteo commented Jan 9, 2019

Backport of #194

@pedrobaeza pedrobaeza added this to the 10.0 milestone Jan 9, 2019
[FIX] Remove unnecesarry piece of code

[FIX] Test coverage

[FIX] Test coverage

[FIX] Test coverage
@tarteo tarteo force-pushed the 10.0-mig-attachment_preview branch from e7c583f to fd8cb98 Compare January 23, 2019 11:57
Copy link

@yung-wang yung-wang left a comment

Choose a reason for hiding this comment

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

Tested and i can see the preview. OK

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

Copy link
Member

@astirpe astirpe left a comment

Choose a reason for hiding this comment

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

Tested in Runbot: OK. Code review: OK.

@tarteo
Copy link
Member Author

tarteo commented Sep 27, 2019

Can this be merged, please 😁

@rafaelbn
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Sorry @rafaelbn you are not allowed to merge.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 10.0-ocabot-merge-pr-199-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Sep 27, 2019
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

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

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.

@pedrobaeza
Copy link
Member

Please rebase and fix the conflict as I needed to fix Travis CI

@tarteo
Copy link
Member Author

tarteo commented Sep 27, 2019

@pedrobaeza Done

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 10.0-ocabot-merge-pr-199-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Sep 27, 2019
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not be finalized, because command git rebase 10.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [MIG] attachment_preview to version 10.0
Using index info to reconstruct a base tree...
M	.travis.yml
Falling back to patching base and 3-way merge...
Removing attachment_preview/view/attachment_preview.xml
Removing attachment_preview/static/src/css/attachment_preview.css
Removing attachment_preview/model/ir_attachment.py
Removing attachment_preview/model/__init__.py
Auto-merging .travis.yml
CONFLICT (content): Merge conflict in .travis.yml
Patch failed at 0001 [MIG] attachment_preview to version 10.0
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".


@pedrobaeza
Copy link
Member

@tarteo please never use GitHub conflict resolution, as it totally messes the commit history. Thanks to bot we have discovered the problem before the merge!

@tarteo
Copy link
Member Author

tarteo commented Oct 1, 2019

@pedrobaeza I created a new PR with the rebase #224

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

7 participants