wrenix/helm-charts
1
0
Fork 0
Code Issues 8 Pull requests 8 Projects Packages Activity

WIP: feat(authentik-application): add saml support - WIP #5

Draft
wrenix wants to merge 1 commit from authentik-application/feat/saml into main
pull from: authentik-application/feat/saml
merge into: wrenix:main
Conversation 0 Commits 1 Files changed 4 +53 -3
wrenix commented 2023-11-06 07:57:43 +00:00 (Migrated from codeberg.org)
Copy link

fix #4

fix #4
This pull request has changes conflicting with the target branch.
  • authentik-application/Chart.yaml
  • authentik-application/README.md
View command line instructions

Checkout

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

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 authentik-application/feat/saml
git checkout authentik-application/feat/saml
git rebase main
git checkout main
git merge --ff-only authentik-application/feat/saml
git checkout authentik-application/feat/saml
git rebase main
git checkout main
git merge --no-ff authentik-application/feat/saml
git checkout main
git merge --squash authentik-application/feat/saml
git checkout main
git merge --ff-only authentik-application/feat/saml
git checkout main
git merge authentik-application/feat/saml
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
chart/authentik-application

   
chart/conduit

   
chart/gotosocial

   
chart/headscale

   
chart/miniserve

   
chart/ntfy

   
global

   
request for chart

   
type/bug

   
type/ci

   
type/doc

   
type/feat
No labels
chart/authentik-application
chart/conduit
chart/gotosocial
chart/headscale
chart/miniserve
chart/ntfy
global
request for chart
type/bug
type/ci
type/doc
type/feat
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: wrenix/helm-charts#5
No description provided.
Delete branch "authentik-application/feat/saml"

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?