mg/homeserver
1
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

WIP: authelia: add traefik dashboard #247

Draft
mg wants to merge 1 commit from traefik_ldap_dashboard into master
pull from: traefik_ldap_dashboard
merge into: mg:master
Conversation 0 Commits 1 Files changed 4 +19 -4
mg commented 2024-11-21 14:23:35 +01:00
Owner
Copy link

docker-compose/traefik/docker-compose.yml.j2
docker-compose/traefik/traefik.yml
group_vars/blocky.yml

Signed-off-by: Michael Grote michael.grote@posteo.de

docker-compose/traefik/docker-compose.yml.j2 docker-compose/traefik/traefik.yml group_vars/blocky.yml Signed-off-by: Michael Grote <michael.grote@posteo.de>
mg added 1 commit 2024-11-21 14:23:38 +01:00
changed Files: docker-compose/authelia/configuration.yml.j2
All checks were successful
ansible-lint / gitleaks (pull_request) Successful in 4s
Details
ansible-lint / Ansible Lint (pull_request) Successful in 35s
Details
c6281461f0 
docker-compose/traefik/docker-compose.yml.j2
docker-compose/traefik/traefik.yml
group_vars/blocky.yml

Signed-off-by: Michael Grote <michael.grote@posteo.de>
All checks were successful
ansible-lint / gitleaks (pull_request) Successful in 4s
Details
ansible-lint / Ansible Lint (pull_request) Successful in 35s
Details
This pull request has changes conflicting with the target branch.
  • docker-compose/authelia/configuration.yml.j2
  • group_vars/blocky.yml
View command line instructions

Checkout

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

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 master
git merge --no-ff traefik_ldap_dashboard
git checkout traefik_ldap_dashboard
git rebase master
git checkout master
git merge --ff-only traefik_ldap_dashboard
git checkout traefik_ldap_dashboard
git rebase master
git checkout master
git merge --no-ff traefik_ldap_dashboard
git checkout master
git merge --squash traefik_ldap_dashboard
git checkout master
git merge --ff-only traefik_ldap_dashboard
git checkout master
git merge traefik_ldap_dashboard
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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: mg/homeserver#247
No description provided.
Delete branch "traefik_ldap_dashboard"

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?