Skip to content

Conversation

shred86
Copy link
Contributor

@shred86 shred86 commented Feb 6, 2020

Proposed change

Updates documentation to reflect changes with #31514.

Type of change

  • Added documentation for a new feature I'm adding to Home Assistant (next branch).
  • Removed stale or deprecated documentation.

Additional information

  • Link to parent pull request in the codebase: #32296

Checklist

  • This PR uses the correct branch, based on one of the following:
    • I made a change that is related to an upcoming version of Home Assistant and used the next branch.
  • The documentation follows the Home Assistant documentation standards.

@probot-home-assistant probot-home-assistant bot added the next This PR goes into the next branch label Feb 6, 2020
@probot-home-assistant probot-home-assistant bot added the has-parent This PR has a parent PR in another repo label Feb 6, 2020
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.

PS: @shred86, please don't remove items from the issue templates. 👍

@frenck frenck added the new-feature This PR adds documentation for a new Home Assistant feature to an existing integration label Feb 6, 2020
@shred86
Copy link
Contributor Author

shred86 commented Feb 8, 2020

I think this will have to be rebased once #11954 gets merged.

@shred86
Copy link
Contributor Author

shred86 commented Feb 28, 2020

Closed the parent PR and created a new one (#32296).

@frenck frenck added the in-progress This PR/Issue is currently being worked on label Feb 28, 2020
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.

Could you please resolve the merge conflict? Thanks! 👍

@shred86
Copy link
Contributor Author

shred86 commented Feb 29, 2020

Hm, after fetching from upstream next and rebasing to upstream/next, when I try git push force --origin, I'm getting this error:

To https://github.com/shred86/home-assistant.io.git
 ! [remote rejected]     abode_cue -> abode_cue (refusing to allow an OAuth App to create or update workflow `.github/workflows/test.yml` without `workflow` scope)
error: failed to push some refs to 'https://github.com/shred86/home-assistant.io.git'

First time seeing this error. Any ideas?

Edit: I just made the changes from the browser. ;) Merge conflict should be resolved!

@frenck
Copy link
Member

frenck commented Mar 2, 2020

That is a new error, by the looks of it, is your application token not provided with the workflow scope. Maybe consider creating a new one.

Thanks for resolving the conflict!

@frenck frenck added awaits-parent Awaits the merge of an parent PR parent-merged The parent PR has been merged already and removed in-progress This PR/Issue is currently being worked on labels Mar 2, 2020
@frenck frenck merged commit 8b1efa0 into home-assistant:next Mar 5, 2020
@probot-home-assistant probot-home-assistant bot removed awaits-parent Awaits the merge of an parent PR parent-merged The parent PR has been merged already labels Mar 5, 2020
@shred86 shred86 deleted the abode_cue branch November 26, 2020 00:47
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 another 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.

2 participants