sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Draft: Two factor auth #118

Open
sonny wants to merge 9 commits from two-factor-auth into development
pull from: two-factor-auth
merge into: sonny:development
Conversation 4 Commits 9 Files changed 17 +291 -50
sonny commented 2021-09-25 13:46:39 +02:00 (Migrated from gitlab.fudiggity.nl)
Copy link
No description provided.
sonny commented 2021-09-25 13:46:39 +02:00 (Migrated from gitlab.fudiggity.nl)
Copy link

assigned to @sonny

assigned to @sonny
sonny commented 2021-09-25 14:02:08 +02:00 (Migrated from gitlab.fudiggity.nl)
Copy link
  • Override two_factor templates
  • Add permission mixin which requires two factor authentication
- [ ] Override two_factor templates - [x] Add permission mixin which requires two factor authentication
sonny commented 2021-09-25 14:17:10 +02:00 (Migrated from gitlab.fudiggity.nl)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>f08d5428 - Fix requirements conflict</li><li>79bff550 - Two factor tidbits</li></ul> [Compare with previous version](/sonny/newsreader/-/merge_requests/38/diffs?diff_id=311&start_sha=ef7c2fef1bc0040d8aad43ab4bd041858f42f90d)
sonny commented 2021-10-07 21:18:02 +02:00 (Migrated from gitlab.fudiggity.nl)
Copy link

added 1 commit

  • 4e52a4e8 - Use otp_required permission decorator

Compare with previous version

added 1 commit <ul><li>4e52a4e8 - Use otp_required permission decorator</li></ul> [Compare with previous version](/sonny/newsreader/-/merge_requests/38/diffs?diff_id=313&start_sha=79bff5505ed7b4eb590427b2c18037c7a9fae42f)
This pull request is broken due to missing fork information.
View command line instructions

Checkout

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

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 development
git merge --no-ff two-factor-auth
git checkout two-factor-auth
git rebase development
git checkout development
git merge --ff-only two-factor-auth
git checkout two-factor-auth
git rebase development
git checkout development
git merge --no-ff two-factor-auth
git checkout development
git merge --squash two-factor-auth
git checkout development
git merge --ff-only two-factor-auth
git checkout development
git merge two-factor-auth
git push origin development
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
0.2

   
0.3

   
bug

   
confirmed

   
critical

   
discussion

   
documentation

   
Doing

   
enhancement

   
suggestion

   
support

   
To Do
No labels
0.2
0.3
bug
confirmed
critical
discussion
documentation
Doing
enhancement
suggestion
support
To Do
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
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: sonny/newsreader#118
No description provided.
Delete branch "two-factor-auth"

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?