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

Changes to support config entries #10467

Merged
merged 7 commits into from
Oct 16, 2019
Merged

Changes to support config entries #10467

merged 7 commits into from
Oct 16, 2019

Conversation

shred86
Copy link
Contributor

@shred86 shred86 commented Sep 27, 2019

Description:

Sets ha_config_flow to true and added some additional instructions to the configurations section.

Pull request in home-assistant (if applicable): home-assistant/core#26699

Checklist:

  • Branch: next is for changes and new documentation that will go public with the next Home Assistant release. Fixes, changes and adjustments for the current release should be created against current.
  • The documentation follows the standards.

@probot-home-assistant probot-home-assistant bot added has-parent This PR has a parent PR in a other repo next This PR goes into the next branch labels Sep 27, 2019
@klaasnicolaas klaasnicolaas added new-feature This PR adds documentation for a new Home Assistant feature to an existing integration ready-for-review This PR needs to be reviewed labels Sep 28, 2019
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

Hi there, @shred86!

I've left some comments, could you take a look? Thanks! 👍

source/_components/abode.markdown Outdated Show resolved Hide resolved
source/_components/abode.markdown Outdated Show resolved Hide resolved
source/_components/abode.markdown Outdated Show resolved Hide resolved
source/_components/abode.markdown Outdated Show resolved Hide resolved
source/_components/abode.markdown Outdated Show resolved Hide resolved
@frenck frenck added in-progress This PR/Issue is currently being worked on and removed ready-for-review This PR needs to be reviewed labels Oct 6, 2019
@shred86
Copy link
Contributor Author

shred86 commented Oct 7, 2019

I've rebased this on my local branch but when I try to git push origin --force, I'm getting an error:

 ! [remote rejected]       patch-1 -> patch-1 (refusing to allow an integration to create or update .github/workflows/markdown.yml)
error: failed to push some refs to 'https://github.com/shred86/home-assistant.io.git'

Edit: Just tried deleting my local repo completely and starting over. Cloned a copy of my GitHub fork and rebased. Still getting the same error. Been trying to resolve this for a couple hours - may be easier to just delete this PR and start over.

@frenck
Copy link
Member

frenck commented Oct 7, 2019

@shred86 I'll rebase this PR for you, hold on ⏳

@frenck frenck self-assigned this Oct 7, 2019
@shred86
Copy link
Contributor Author

shred86 commented Oct 9, 2019

Any luck with the rebase? Hopefully I didn't completely screw this PR up. ;(

I do have one minor update to the documentation though once it's rebased.

shred86 and others added 6 commits October 9, 2019 12:11
Sets `ha_config_flow` to `true` and added some additional instructions to the configurations section. This is tied to the following pull request: home-assistant/core#26699
The 'exclude', 'light' & 'name' configuration variables are no longer used in the abode component.
Co-Authored-By: Franck Nijhof <[email protected]>
Co-Authored-By: Franck Nijhof <[email protected]>
@frenck
Copy link
Member

frenck commented Oct 9, 2019

@shred86 Rebased and resolved all merge conflicts.
There isn't much you can't fix with git 😉

@frenck frenck removed their assignment Oct 9, 2019
@frenck frenck added ready-for-review This PR needs to be reviewed and removed in-progress This PR/Issue is currently being worked on labels Oct 9, 2019
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

✅ Approved. Can be merged as soon as the parent PR gets merged.

@frenck frenck removed the ready-for-review This PR needs to be reviewed label Oct 9, 2019
@frenck frenck added the awaits-parent Awaits the merge of an parent PR label Oct 9, 2019
@MartinHjelmare MartinHjelmare added parent-merged The parent PR has been merged already and removed awaits-parent Awaits the merge of an parent PR labels Oct 13, 2019
@frenck frenck merged commit a1dc242 into home-assistant:next Oct 16, 2019
@probot-home-assistant probot-home-assistant bot removed the parent-merged The parent PR has been merged already label Oct 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has-parent This PR has a parent PR in a other repo new-feature This PR adds documentation for a new Home Assistant feature to an existing integration next This PR goes into the next branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants