Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Feb 12, 2025

Backport of #46114

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested review from artonge, blizzz and come-nc February 12, 2025 12:16
@backportbot backportbot bot added 3. to review Waiting for reviews feature: ldap labels Feb 12, 2025
@backportbot backportbot bot added this to the Nextcloud 30.0.6 milestone Feb 12, 2025
@max-nextcloud max-nextcloud force-pushed the backport/46114/stable30 branch from 8c026b1 to 056cf99 Compare March 4, 2025 11:30
@max-nextcloud max-nextcloud marked this pull request as ready for review March 4, 2025 11:31
@max-nextcloud max-nextcloud enabled auto-merge March 4, 2025 11:46
@max-nextcloud
Copy link
Contributor

/backport to stable29

@blizzz blizzz mentioned this pull request Mar 4, 2025
13 tasks
@max-nextcloud max-nextcloud force-pushed the backport/46114/stable30 branch 2 times, most recently from 3803570 to 3aeee6a Compare March 5, 2025 06:30
@max-nextcloud
Copy link
Contributor

/backport! to stable29

come-nc added 6 commits March 5, 2025 14:46
…first time

Avoids using several LDAP searches to get UUID, display name and
 internal name, now gets all attributes at the same time.
Also avoids extra request to build an unused user object in userExists.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
…n mapping new user

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Avoid surprises by making sure these are lowercased apart from
 documented special case user displayname.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
…anager

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@max-nextcloud max-nextcloud force-pushed the backport/46114/stable30 branch from 3aeee6a to 9982e29 Compare March 5, 2025 13:46
@max-nextcloud max-nextcloud merged commit 88408b6 into stable30 Mar 5, 2025
176 checks passed
@max-nextcloud max-nextcloud deleted the backport/46114/stable30 branch March 5, 2025 14:02
@backportbot
Copy link
Author

backportbot bot commented Mar 5, 2025

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/50778/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 41aadb5b 64ae882b a36bcd0d 17a680c2 8717646c 9982e291

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/50778/stable29

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/50778/stable29."}


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants