Skip to content

add last-triggered to secondary_info#11221

Merged
frenck merged 1 commit into
home-assistant:nextfrom
Mariusthvdb:patch-4
Nov 26, 2019
Merged

add last-triggered to secondary_info#11221
frenck merged 1 commit into
home-assistant:nextfrom
Mariusthvdb:patch-4

Conversation

@Mariusthvdb
Copy link
Copy Markdown
Contributor

adding info to the docs following PR home-assistant/frontend#4222 which add last-triggered to the secondary_info options

Description:

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

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 another repo current This PR goes into the current branch labels Nov 18, 2019
@klaasnicolaas
Copy link
Copy Markdown
Member

Please rebase this PR to the next branch

@Mariusthvdb Mariusthvdb changed the base branch from current to next November 18, 2019 12:12
@probot-home-assistant probot-home-assistant Bot added next This PR goes into the next branch and removed current This PR goes into the current branch labels Nov 18, 2019
@Mariusthvdb
Copy link
Copy Markdown
Contributor Author

ok, thanks, done.

@klaasnicolaas
Copy link
Copy Markdown
Member

You have now only changed the target branch, you must also rebase the branch on your fork

@klaasnicolaas klaasnicolaas added needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch in-progress This PR/Issue is currently being worked on labels Nov 18, 2019
@Mariusthvdb
Copy link
Copy Markdown
Contributor Author

Mariusthvdb commented Nov 18, 2019

not at all sure what to do or where to go to change these branches, please help?

@frenck
Copy link
Copy Markdown
Member

frenck commented Nov 18, 2019

@Mariusthvdb This cannot be done from the web interface. You need to rebase your commits from the branch you've created onto the next branch. This can only be done locally.

PS: If you are new to this, or not feel like doing it, please let me know. I can rebase it for you if wished for.

@Mariusthvdb
Copy link
Copy Markdown
Contributor Author

yes I am new to this, and normally would love to learn...for the speed of things it would be best if you'd be so kind to rebase for me ;-)

so many links and references, its a bit overwhelming right now..

@klaasnicolaas klaasnicolaas changed the base branch from next to current November 18, 2019 16:31
@probot-home-assistant probot-home-assistant Bot added current This PR goes into the current branch and removed next This PR goes into the next branch labels Nov 18, 2019
@klaasnicolaas klaasnicolaas changed the base branch from current to next November 18, 2019 16:31
@probot-home-assistant probot-home-assistant Bot added next This PR goes into the next branch and removed current This PR goes into the current branch labels Nov 18, 2019
adding info to the docs following PR home-assistant/frontend#4222 which add last-triggered to the secondary_info options
@klaasnicolaas
Copy link
Copy Markdown
Member

@Mariusthvdb I did a rebase on your PR, so that is now resolved 😉

@klaasnicolaas klaasnicolaas removed the needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch label Nov 18, 2019
@frenck frenck removed the in-progress This PR/Issue is currently being worked on label Nov 18, 2019
Copy link
Copy Markdown
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 added the awaits-parent Awaits the merge of an parent PR label Nov 18, 2019
@Mariusthvdb
Copy link
Copy Markdown
Contributor Author

Mariusthvdb commented Nov 18, 2019

thank you both very much.

couldn't have made it without you ;-) Much appreciated indeed!

@frenck frenck added the parent-merged The parent PR has been merged already label Nov 23, 2019
@frenck frenck merged commit 4ce142f into home-assistant:next Nov 26, 2019
@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 Nov 26, 2019
@Mariusthvdb Mariusthvdb deleted the patch-4 branch September 25, 2024 07:37
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 next This PR goes into the next branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants