Skip to content

Trigger name collision workaround #5335

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.

Sign up for GitHub

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

Jump to bottom
Closed
mjtice wants to merge 4 commits into from
Closed

Trigger name collision workaround #5335

mjtice wants to merge 4 commits into from

Conversation

@mjtice
Copy link
Contributor

@mjtice mjtice commented Aug 19, 2021

This addresses the jinja trigger name collision noted in issue #4641
@pull-request-size pull-request-size bot added the size/S PR that changes 10-29 lines. Very easy to review. label Aug 19, 2021
@CLAassistant
Copy link

CLAassistant commented Aug 19, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.
Kami
Kami reviewed Aug 27, 2021
View reviewed changes
Kami
Kami reviewed Aug 27, 2021
View reviewed changes
@mjtice

This comment has been minimized.

Sign in to view
@amanda11

This comment has been minimized.

Sign in to view
@cognifloyd
Copy link
Member

cognifloyd commented Oct 5, 2021

This looks like a good clean change.

@mjtice would you please sign the CLA #5335 (comment) ? It would be great to merge this sooner rather than later.
@cognifloyd cognifloyd added this to the 3.7.0 milestone Oct 5, 2021
@cognifloyd cognifloyd added the status:needs cla A manual tag to note PRs that are otherwise ready, but the CLA bot says the CLA has not been signed. label Oct 5, 2021
@mjtice
Copy link
Contributor Author

mjtice commented Oct 6, 2021

This looks like a good clean change.

@mjtice would you please sign the CLA #5335 (comment) ? It would be great to merge this sooner rather than later.

Done.
@cognifloyd cognifloyd requested a review from Kami October 6, 2021 13:51
@cognifloyd cognifloyd removed the status:needs cla A manual tag to note PRs that are otherwise ready, but the CLA bot says the CLA has not been signed. label Oct 6, 2021
@cognifloyd
Copy link
Member

cognifloyd commented Oct 6, 2021

It looks like maintainer edits aren't allowed - and I don't think github allows that for forks in organizations.

So, let's see if we can get this ready to merge together. Please:

  1. add a changelog entry
  2. merge in master

I'm not sure why GHA tests haven't run for the last commit (only circleci ran? weird). I hope tests will run once you do that, if not I might need to pull in your commits another way.
@cognifloyd cognifloyd mentioned this pull request Oct 7, 2021
Merged
@cognifloyd
Copy link
Member

cognifloyd commented Oct 7, 2021

I just opened #5383 to include your changes. As soon as someone else approves it, we can get it merged.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug fix packs size/S PR that changes 10-29 lines. Very easy to review.

5 participants

@mjtice @CLAassistant @amanda11 @cognifloyd @Kami