Skip to content

chore: merge main to the release branch for next release#5575

Merged
rjsparks merged 10 commits intoreleasefrom
main
May 4, 2023
Merged

chore: merge main to the release branch for next release#5575
rjsparks merged 10 commits intoreleasefrom
main

Conversation

@rjsparks
Copy link
Copy Markdown
Member

@rjsparks rjsparks commented May 4, 2023

No description provided.

jennifer-richards and others added 10 commits April 26, 2023 18:34
fix: Avoid 500 error creating account when User.person is None
…pm/2023-05-01

chore(deps): update all npm dependencies for playwright
…action/npm/2023-05-01

chore(deps): update all npm dependencies for dev/coverage-action
Avoids losing the listener when DOM is changed dynamically.
* ISE may initiate conflict review

Add ISE to list of those roles who can initiate a conflict review.

* fix: improve conditional for conflict review action. Add tests.

* chore: fix comment typo

---------

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
@rjsparks rjsparks requested a review from jennifer-richards May 4, 2023 16:55
Copy link
Copy Markdown
Member

@jennifer-richards jennifer-richards left a comment

Choose a reason for hiding this comment

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

Looks good.

As we discussed last week, github is pointing out that the release branch is ahead of main due to the merge commit from last time.

@rjsparks rjsparks merged commit e32b453 into release May 4, 2023
@ietf-tools ietf-tools deleted a comment from TateGunning May 6, 2023
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators May 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants