WIP: Add Two Factor Authentication #7

Draft
adoralaura wants to merge 11 commits from feature-2fa into main
Owner

closes #6

closes #6
adoralaura added the
enhancement
label 2024-05-04 16:23:07 +02:00
adoralaura self-assigned this 2024-05-04 16:23:27 +02:00
adoralaura added a new dependency 2024-05-04 16:23:42 +02:00
adoralaura removed a dependency 2024-05-04 16:23:51 +02:00
adoralaura added 1 commit 2024-05-04 17:06:05 +02:00
adoralaura added 1 commit 2024-05-06 13:11:48 +02:00
adoralaura added 1 commit 2024-05-06 15:32:54 +02:00
adoralaura added 1 commit 2024-05-06 16:09:15 +02:00
adoralaura added 1 commit 2024-05-06 16:09:53 +02:00
adoralaura added 1 commit 2024-05-06 21:38:54 +02:00
adoralaura added 2 commits 2024-05-09 15:02:45 +02:00
adoralaura added 1 commit 2024-05-09 15:28:07 +02:00
adoralaura added 1 commit 2024-05-10 11:44:46 +02:00
adoralaura added 1 commit 2024-09-30 13:19:08 +02:00
This pull request is marked as a work in progress.
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff feature-2fa
git checkout feature-2fa
git rebase main
git checkout main
git merge --ff-only feature-2fa
git checkout feature-2fa
git rebase main
git checkout main
git merge --no-ff feature-2fa
git checkout main
git merge --squash feature-2fa
git checkout main
git merge --ff-only feature-2fa
git checkout main
git merge feature-2fa
git push origin main
Sign in to join this conversation.
No description provided.