ilot/iports
1
0
Fork 0
Code Issues 21 Pull requests 2 Projects Releases Packages 77 Wiki Activity Actions

ilot/authentik: use latest py3-django-rest-framework #178

Open
ayakael wants to merge 1 commit from authentik/upgrade-drf into v3.21
pull from: authentik/upgrade-drf
merge into: ilot:v3.21
Conversation 0 Commits 1 Files changed 1 +2 -2
ayakael commented 2025-04-01 01:00:32 +00:00
Owner
Copy link
No description provided.
ayakael added 1 commit 2025-04-01 01:00:33 +00:00
ilot/authentik: use latest py3-django-rest-framework
Some checks failed
/ lint (pull_request) Successful in 38s
Details
/ build-x86_64 (pull_request) Successful in 38m41s
Details
/ deploy-x86_64 (pull_request) Successful in 31s
Details
/ deploy-aarch64 (pull_request) Has been skipped
Details
/ build-aarch64 (pull_request) Failing after 46m2s
Details
f73599ce86
Some checks failed
/ lint (pull_request) Successful in 38s
Details
/ build-x86_64 (pull_request) Successful in 38m41s
Details
/ deploy-x86_64 (pull_request) Successful in 31s
Details
/ deploy-aarch64 (pull_request) Has been skipped
Details
/ build-aarch64 (pull_request) Failing after 46m2s
Details
This pull request has changes conflicting with the target branch.
  • ilot/authentik/APKBUILD
View command line instructions

Checkout

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

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 v3.21
git merge --no-ff authentik/upgrade-drf
git checkout authentik/upgrade-drf
git rebase v3.21
git checkout v3.21
git merge --ff-only authentik/upgrade-drf
git checkout authentik/upgrade-drf
git rebase v3.21
git checkout v3.21
git merge --no-ff authentik/upgrade-drf
git checkout v3.21
git merge --squash authentik/upgrade-drf
git checkout v3.21
git merge --ff-only authentik/upgrade-drf
git checkout v3.21
git merge authentik/upgrade-drf
git push origin v3.21
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Fix

   
Maintenance

   
New aport

   
Upstream
No labels
Fix
Maintenance
New aport
Upstream
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: ilot/iports#178
No description provided.
Delete branch "authentik/upgrade-drf"

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?