dev → main 3/25/24 #233
dev → main 3/25/24 #233
Conversation
Include snapshot for error state
add optional component prop
…ed_password_reset Improved password reset
|
@mbodeantor how do you feel about merging into main for most things, and keeping dev up to date / using it to test large or critical things that need to be deployed to test properly → merged into main individually? |
|
@josh-chamberlain That could work, it would then be incumbent on anyone merging their code into dev to first merge main into dev. |
Add password hints
Update snapshot
|
PR is here for the password hints on |
…d-password-hints-to-reset fix: add password hints to reset
Mc fix type hinting bug
…cstring_resources
…esources Mc type hinting and docstring resources
|
@joshuagraber @josh-chamberlain I think this is ready to go then? |
…ce_test # Conflicts: # app.py
Mc create first resource test
|
@mbodeantor yeah, works for me! |
@josh-chamberlain @mbodeantor Alternatively, we create a Github Action which, on a Dev PR, merges Main into Dev first. I could create an issue on that. Would save time and reduce risk of someone forgetting to do that. |
|
I think this will happen on its own—when you create a PR, you can see how many commits you are behind main. We could maybe schedule a job to open a PR, but not merge it. |
|
@josh-chamberlain @maxachis I think the github action on PR could be handy. We already have some running on PR open so it would just be a fairly simple addition to the pull file |
Contains