Skip to content
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.

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

Add ncstate-delta/moodle-mod_zoom with v5.2.4 tag to mod/zoom as a git submodule #95

Conversation

ctam
Copy link

@ctam ctam commented Oct 18, 2024


@ctam ctam self-assigned this Oct 18, 2024
@ctam ctam requested a review from a team October 18, 2024 19:38
Copy link

@mirleu mirleu left a comment

Choose a reason for hiding this comment

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

LGTM

@ctam
Copy link
Author

ctam commented Oct 19, 2024

Inherited 12 PHPUnit test errors from the STABLE branch.

@ctam ctam force-pushed the UCSFCLE_404-Add_ncstate-delta/moodle-mod_zoom_as_a_submodule branch from a6083ed to dfc8380 Compare October 22, 2024 21:08
@ctam
Copy link
Author

ctam commented Oct 22, 2024

Rebased. Running tests here.

@ctam ctam force-pushed the UCSFCLE_404-Add_ncstate-delta/moodle-mod_zoom_as_a_submodule branch from dfc8380 to 0ff137f Compare October 23, 2024 12:45
@ctam
Copy link
Author

ctam commented Oct 23, 2024

Re-ran Core / PHPUnit tests. All passed. Ready for review.

@ctam ctam marked this pull request as ready for review October 23, 2024 19:22
@ctam ctam requested a review from a team October 23, 2024 21:21
@ctam
Copy link
Author

ctam commented Oct 23, 2024

Hey @mirleu, could you do another review and merge it if it looks good to you? Thanks!

Copy link

@mirleu mirleu left a comment

Choose a reason for hiding this comment

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

LGTM

@mirleu
Copy link

mirleu commented Oct 23, 2024

This branch has conflicts that must be resolved

@ctam I approved but there seems to be conflicts and it's not allowing me to merge.

@lbailey-ucsf
Copy link
Collaborator

lbailey-ucsf commented Oct 23, 2024

This branch has conflicts that must be resolved

@ctam I approved but there seems to be conflicts and it's not allowing me to merge.

I resolved the conflict but now tests are running again. @ctam @mirleu your call on when to merge. I should note that I did not put the submodules in order when resolving the conflict.

@mirleu mirleu merged commit 20f6dce into ucsf-education:UCSFCLE_404_STABLE Oct 23, 2024
1 of 2 checks passed
@ctam ctam deleted the UCSFCLE_404-Add_ncstate-delta/moodle-mod_zoom_as_a_submodule branch October 24, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants