Skip to content

[MIG] server_environment_ir_config_parameter: Migration to 13.0 - #30

Merged
OCA-git-bot merged 24 commits into
OCA:13.0from
grindtildeath:13.0-mig-server_environment_ir_config_parameter
Feb 13, 2020
Merged

OCA-git-bot merged 24 commits into
OCA:13.0from
grindtildeath:13.0-mig-server_environment_ir_config_parameter

Conversation

@grindtildeath

@grindtildeath grindtildeath commented Oct 9, 2019

Copy link
Copy Markdown
Contributor

@OCA-git-bot OCA-git-bot mentioned this pull request Oct 10, 2019
4 tasks
@gurneyalex gurneyalex added this to the 13.0 milestone Oct 10, 2019
florian-dacosta pushed a commit to akretion/server-env that referenced this pull request Oct 23, 2019
[11.0] keychain: improve ACL and allow storing ssh keys as password OCA#30

@Tonow-c2c Tonow-c2c left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@grindtildeath You have dependence error in travis
but code LGTM

@yvaucher yvaucher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@yvaucher

yvaucher commented Dec 2, 2019

Copy link
Copy Markdown
Member

/ocabot merge

@OCA-git-bot

Copy link
Copy Markdown
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 13.0-ocabot-merge-pr-30-by-yvaucher-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 2, 2019
Signed-off-by yvaucher
@OCA-git-bot

Copy link
Copy Markdown
Contributor

@yvaucher your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-30-by-yvaucher-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.

@yvaucher

Copy link
Copy Markdown
Member

/ocabot merge

@OCA-git-bot

Copy link
Copy Markdown
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 13.0-ocabot-merge-pr-30-by-yvaucher-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 16, 2019
Signed-off-by yvaucher
@OCA-git-bot

Copy link
Copy Markdown
Contributor

@yvaucher your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-30-by-yvaucher-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.

@simahawk

Copy link
Copy Markdown
Contributor

@grindtildeath can you rebase?

@grindtildeath
grindtildeath force-pushed the 13.0-mig-server_environment_ir_config_parameter branch from 6de2a41 to 0246d9f Compare January 27, 2020 15:03
@yvaucher

Copy link
Copy Markdown
Member

@grindtildeath seems that you also need to re-run the pre-commit hook.
Black will have to replace some ' by "

@grindtildeath

Copy link
Copy Markdown
Contributor Author

@yvaucher Should be better now :)

@yvaucher

Copy link
Copy Markdown
Member

@grindtildeath good one step further lint passes now.

But pytest fails on some tests of this module.

Before, the values used in the tests were coming from server_environment_files_sample
that were made available using a symbolic link in .travis.yml.
Now, it's loaded dynamically at test execution.
@grindtildeath
grindtildeath force-pushed the 13.0-mig-server_environment_ir_config_parameter branch from 53deee8 to 3fb6489 Compare February 13, 2020 10:09

@yvaucher yvaucher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🎉 thanks for the fix in the tests

Good to be merged.

@yvaucher

Copy link
Copy Markdown
Member

/ocabot merge

@OCA-git-bot

Copy link
Copy Markdown
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 13.0-ocabot-merge-pr-30-by-yvaucher-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Feb 13, 2020
Signed-off-by yvaucher
@OCA-git-bot
OCA-git-bot merged commit 3fb6489 into OCA:13.0 Feb 13, 2020
@OCA-git-bot

Copy link
Copy Markdown
Contributor

Congratulations, your PR was merged at bc7ea2e. 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.