fablab-nea/labsync
1
0
Fork 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity Actions

WIP: Add LDAP authentication #51

Draft
sbruder wants to merge 2 commits from ldap into main
pull from: ldap
merge into: fablab-nea:main
Conversation 3 Commits 2 Files changed 9 +142
sbruder commented 2018-05-19 22:45:17 +00:00 (Migrated from gitlab.jalr.de)
Copy link

TODO:

  • Use Let’s encrypt certificate
TODO: * [ ] Use Let’s encrypt certificate
sbruder commented 2018-05-20 08:41:42 +00:00 (Migrated from gitlab.jalr.de)
Copy link

mentioned in issue #5

mentioned in issue #5
sbruder commented 2018-06-07 16:12:44 +00:00 (Migrated from gitlab.jalr.de)
Copy link

added 14 commits

  • f044a5d9...b204cc06 - 12 commits from branch master
  • ab5400bf - add ldap
  • a3ba1c29 - FIXME: add self signed cert

Compare with previous version

added 14 commits <ul><li>f044a5d9...b204cc06 - 12 commits from branch <code>master</code></li><li>ab5400bf - add ldap</li><li>a3ba1c29 - FIXME: add self signed cert</li></ul> [Compare with previous version](https://gitlab.jalr.de/fablab/labsync/merge_requests/25/diffs?diff_id=82&start_sha=f044a5d9cac4dc9a808faf85aa1ca22e86365096)
sbruder commented 2018-06-28 17:21:59 +00:00 (Migrated from gitlab.jalr.de)
Copy link

added 13 commits

  • a3ba1c29...3697225a - 11 commits from branch master
  • b5099fd4 - add ldap
  • af42dc63 - FIXME: add self signed cert

Compare with previous version

added 13 commits <ul><li>a3ba1c29...3697225a - 11 commits from branch <code>master</code></li><li>b5099fd4 - add ldap</li><li>af42dc63 - FIXME: add self signed cert</li></ul> [Compare with previous version](https://gitlab.jalr.de/fablab/labsync/merge_requests/25/diffs?diff_id=90&start_sha=a3ba1c2939c51544164303ddce47523aaab13599)
jalr (Migrated from gitlab.jalr.de) changed target branch from master to main 2022-01-07 01:53:17 +00:00
This pull request has changes conflicting with the target branch.
  • packer/ansible/roles/auth/tasks/main.yml
View command line instructions

Checkout

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

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

   
feature

   
help-wanted

   
question

   
software

   
style
No labels
bug
feature
help-wanted
question
software
style
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: fablab-nea/labsync#51
No description provided.
Delete branch "ldap"

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?