Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable23] Fix createNamedParameter in LDAP migrations #36470

Merged
merged 1 commit into from
Feb 2, 2023

Conversation

icewind1991
Copy link
Member

Partial backport of #31872

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Feb 1, 2023
@blizzz blizzz changed the title Fix createNamedParameter in LDAP migrations [stable23] Fix createNamedParameter in LDAP migrations Feb 1, 2023
@blizzz
Copy link
Member

blizzz commented Feb 1, 2023

/backport to stable22

@blizzz
Copy link
Member

blizzz commented Feb 2, 2023

There was 1 failure:

  1. Test\Avatar\GuestAvatarTest::testGet
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -Binary String: 0x89504e470d0a1a0a0000000d4948445200000020000000200802000000fc18eda3000000097048597300000ec400000ec401952b0e1b000000bf49444154488963f49cb58881968089a6a68f5a306ac1d0b0808518455cacac62bcdc6882efbe7efff4f327752c309695aa74b643139c77f2dc9a4b57a9630104b4ec3ef8e4c34738f7ddf7efc4e822c182679f3e3d42b2804830382219025899985998100efaf3ef1f952d9818e885cc4d5db5e1e9c7cfd4b460fad1532f3e7f8173df7cf9468c2e122cb8fce2e583771f88570f0123a4a8800013196959017e38f7fedbf74f3e7ea2a60549e646c85c228b0ac6d156c5a805a3160c030b00f4283ddebeb8599a0000000049454e44ae426082
    +Binary String: 0x89504e470d0a1a0a0000000d4948445200000020000000200802000000fc18eda3000000097048597300000ec400000ec401952b0e1b000000be49444154488963f49cb58881968089a6a68f5a306a0155000b91eab85859c578b9d104df7dfdfee9e74fea58602c2b55e96c872638efe4b93597ae52c7020868d97df0c9878f70eebbefdf096a21cd82679f3e3d42b2801830682219025899985998106efaf3ef1f952d9818e885cc4d5db5e1e9c7cfd4b460fad1532f3e7f8173df7cf946500b69165c7ef1f2c1bb0f2469193945050498c848cb0af0c3b9f7dfbe7ff2f113352d48323742e6125354308e56faa3168c5a306a016100000b773dde126d19150000000049454e44ae426082

/drone/src/tests/lib/Avatar/GuestAvatarTest.php:70

Unrelated → merging

@blizzz blizzz merged commit 6c425c9 into stable23 Feb 2, 2023
@blizzz blizzz deleted the ldap-migrate-dn-length-type-23 branch February 2, 2023 08:22
@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable22

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable22

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@blizzz
Copy link
Member

blizzz commented Feb 2, 2023

backport branch was actually created, but the PR was not created. maybe github hiccup. backport in #36495

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

Successfully merging this pull request may close these issues.

4 participants