Skip to content

[stable22] Use getLengthExpression to measure field length instead of like#35758

Merged
come-nc merged 5 commits into
stable22from
backport/31696/stable22
Dec 20, 2022
Merged

[stable22] Use getLengthExpression to measure field length instead of like#35758
come-nc merged 5 commits into
stable22from
backport/31696/stable22

Conversation

@backportbot-nextcloud

@backportbot-nextcloud backportbot-nextcloud Bot commented Dec 13, 2022

Copy link
Copy Markdown
  • ⚠️ This backport had conflicts and is incomplete

backport of #31696

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

@PVince81 PVince81 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 but conflicts

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@mejo- mejo- force-pushed the backport/31696/stable22 branch from 30db3e0 to 1578120 Compare December 14, 2022 09:54
@mejo-

mejo- commented Dec 14, 2022

Copy link
Copy Markdown
Member

I resolved the conflicts and backported the missing code parts manually.

@ChristophWurst ChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good

@danxuliu danxuliu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict resolution looks good 👍 (I can not judge the code, though)

@come-nc come-nc merged commit dfc6cf1 into stable22 Dec 20, 2022
@come-nc come-nc deleted the backport/31696/stable22 branch December 20, 2022 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants