forge/ayaports
1
0
Fork 0
Code Issues 42 Pull requests 10 Projects Releases Packages Wiki Activity Actions

WIP: user/wallabag: add experimental LDAP support #199

Draft
ayakael wants to merge 4 commits from wallabag/ldap-support into edge
pull from: wallabag/ldap-support
merge into: forge:edge
Conversation 4 Commits 4 Files changed 6 +714 -124
ayakael commented 2023-06-26 19:11:22 +00:00 (Migrated from lab.ilot.io)
Copy link
No description provided.
ayakael commented 2023-06-26 19:21:05 +00:00 (Migrated from lab.ilot.io)
Copy link

added 1 commit

  • df93bbae - fix

Compare with previous version

added 1 commit <ul><li>df93bbae - fix</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/172/diffs?diff_id=1920&start_sha=a92c4ba01b69bdf85aaf79038653506e35af2d5a)
ayakael (Migrated from lab.ilot.io) changed target branch from v3.18 to edge 2023-08-31 22:24:09 +00:00
ayakael commented 2023-09-01 00:33:51 +00:00 (Migrated from lab.ilot.io)
Copy link

added 156 commits

  • df93bbae...1fc4159e - 154 commits from branch edge
  • a7484652 - user/wallabag: add experimental LDAP support
  • 5f31cbbb - fix

Compare with previous version

added 156 commits <ul><li>df93bbae...1fc4159e - 154 commits from branch <code>edge</code></li><li>a7484652 - user/wallabag: add experimental LDAP support</li><li>5f31cbbb - fix</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/172/diffs?diff_id=2618&start_sha=df93bbae9228b37168f259e4578844967f21b4c3)
ayakael commented 2023-11-29 01:47:35 +00:00 (Migrated from lab.ilot.io)
Copy link

marked this merge request as draft

marked this merge request as **draft**
ayakael commented 2024-04-14 00:41:20 +00:00 (Migrated from lab.ilot.io)
Copy link

mentioned in issue ilot/issues#121

mentioned in issue ilot/issues#121
forge changed title from Draft: user/wallabag: add experimental LDAP support to WIP: user/wallabag: add experimental LDAP support 2024-09-03 16:26:56 +00:00
This pull request has changes conflicting with the target branch.
  • backports/freecad/APKBUILD
  • user/wallabag/APKBUILD
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout edge
git merge --no-ff wallabag/ldap-support
git checkout edge
git merge --ff-only wallabag/ldap-support
git checkout wallabag/ldap-support
git rebase edge
git checkout edge
git merge --no-ff wallabag/ldap-support
git checkout edge
git merge --squash wallabag/ldap-support
git checkout edge
git merge --ff-only wallabag/ldap-support
git checkout edge
git merge wallabag/ldap-support
git push origin edge
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Backport

   
Blocked

   
Enhancement

   
Fix

   
Maintenance

   
Needs action

   
New aport

   
Security
No labels
Backport
Blocked
Enhancement
Fix
Maintenance
Needs action
New aport
Security
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: forge/ayaports#199
No description provided.
Delete branch "wallabag/ldap-support"

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?