skobkin/magnetico-web
skobkin/magnetico-web
1
1
Fork 0
Code Issues Pull requests 2 Releases Activity

WIP: reCaptcha -> hCaptcha #6

Draft
skobkin wants to merge 1 commit from feature_hcaptcha into master
pull from: feature_hcaptcha
merge into: skobkin:master
Conversation 0 Commits 1 Files changed 15 +209 -191
skobkin commented 2022-07-07 22:30:02 +00:00
Owner
Copy link

reCaptcha -> hCaptcha

reCaptcha -> hCaptcha
skobkin self-assigned this 2022-07-07 22:30:02 +00:00
skobkin added 1 commit 2022-07-07 22:30:03 +00:00
skobkin changed title from reCaptcha -> hCaptcha to WIP: reCaptcha -> hCaptcha 2022-07-07 22:30:24 +00:00
skobkin added the
enhancement
 label 2022-07-08 02:20:36 +00:00
This pull request has changes conflicting with the target branch.
  • .env
  • config/packages/ewz_recaptcha.yaml
  • src/Form/Data/PasswordResetRequestData.php
  • src/Form/PasswordResetRequestType.php
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature_hcaptcha:feature_hcaptcha
git checkout feature_hcaptcha

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff feature_hcaptcha
git checkout master
git merge --ff-only feature_hcaptcha
git checkout feature_hcaptcha
git rebase master
git checkout master
git merge --no-ff feature_hcaptcha
git checkout master
git merge --squash feature_hcaptcha
git checkout master
git merge --ff-only feature_hcaptcha
git checkout master
git merge feature_hcaptcha
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
enhancement

New feature

No labels
bug
enhancement
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
skobkin
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: skobkin/magnetico-web#6
No description provided.
Delete branch "feature_hcaptcha"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?