Skip to content

Conversation

fulldecent
Copy link
Contributor

No description provided.

Raza403 and others added 11 commits July 5, 2025 17:55
… being generated. This PR is made for #1 and #2

custom cert, updated the names of both code generation methods.

Added view_user_cert page, a logged in user can see certificate if having a valid token and ecard code. This is being used from view_tokens.php page.

customcert view certificate function is made. This is made for mdjnelson#212

Updated verify certificate URL. This PR is made for 221

Updated the verify URL for QR code.
… being generated. This PR is made for #1 and #2

custom cert, updated the names of both code generation methods.

Added view_user_cert page, a logged in user can see certificate if having a valid token and ecard code. This is being used from view_tokens.php page.

customcert view certificate function is made. This is made for mdjnelson#212

Updated verify certificate URL. This PR is made for 221

Updated the verify URL for QR code.
@fulldecent fulldecent changed the title Features/create delete unit test test: create/delete unit test Jul 29, 2025
@fulldecent
Copy link
Contributor Author

Hi @Raza403 I see some unrelated changes here (we are targeting the MOODLE 404 branch.

Can you please squash/rebase on top of MOODLE_404_STABLE?

While you are doing this, please carefully review the diff before you make this the commit. For example, this commit makes changes to the database, that should not be in-scope for a change that affects on test cases.

@Raza403 Raza403 force-pushed the features/create-delete-unit-test branch from ccbe44b to c025ac5 Compare July 30, 2025 11:49
@Raza403 Raza403 force-pushed the features/create-delete-unit-test branch from c025ac5 to 178d8fe Compare July 30, 2025 11:54
@Raza403
Copy link
Contributor

Raza403 commented Jul 30, 2025

You're right — after investigating, I found that the extra commits are coming from our fork’s MOODLE_404_STABLE branch.

It appears that we previously submitted PRs for those changes, and @mdjnelson may have manually applied them directly to the upstream without merging our original PRs. As a result, our fork’s MOODLE_404_STABLE now includes those commits, even though they were already incorporated upstream. That history is now showing up in every new PR, even when unrelated.

I’ve tried everything I could to isolate the current changes — including resetting to the real upstream, cherry-picking the single intended commit, and force-pushing a clean branch. Despite that, GitHub continues to show unrelated commits in the PR diff, likely due to how the forked base branch has diverged.

You can see in the screenshot that my local branch only contains one clean commit, but the PR still picks up historical noise from the base.

Screenshot 2025-07-30 at 6 02 14 PM

@mdjnelson
Copy link
Owner

To make it easier just create a branch for this PR, base it on my branch and then cherry-pick the commit that has been added to add unit tests. :)

@Raza403
Copy link
Contributor

Raza403 commented Aug 5, 2025

Created a clean PR here, it is safe to close this PR.

@mdjnelson
Copy link
Owner

You can always force push with git instead of creating another PR. :)

@mdjnelson mdjnelson closed this Aug 24, 2025
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