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

[stable25] Port admin delegation selects #36929

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 1, 2023

  • ⚠️ This backport had conflicts and is incomplete

backport of #36650

@@ -82,9 +82,11 @@
$settings = array_merge(
$settings,
array_map(function (IDelegatedSettings $setting) use ($section) {
$sectionName = $section->getName() . ($setting->getName() !== null ? ' - ' . $setting->getName() : '');

Check notice

Code scanning / Psalm

PossiblyNullOperand

Cannot concatenate with a possibly null null|string
@JuliaKirschenheuter JuliaKirschenheuter self-requested a review March 1, 2023 07:49
@JuliaKirschenheuter JuliaKirschenheuter self-assigned this Mar 2, 2023
@JuliaKirschenheuter JuliaKirschenheuter force-pushed the backport/36650/stable25 branch 2 times, most recently from 33bf152 to b6fbe92 Compare March 2, 2023 08:59
@artonge
Copy link
Contributor

artonge commented Mar 2, 2023

/compile amend /

Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@nextcloud-command nextcloud-command force-pushed the backport/36650/stable25 branch from b6fbe92 to ed8bae0 Compare March 2, 2023 10:17
@Pytal Pytal self-assigned this Mar 3, 2023
@Pytal Pytal added the 4. to release Ready to be released and/or waiting for tests to finish label Mar 3, 2023
@Pytal Pytal merged commit b1b5ed6 into stable25 Mar 3, 2023
@Pytal Pytal deleted the backport/36650/stable25 branch March 3, 2023 00:17
@blizzz blizzz mentioned this pull request Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish accessibility feature: settings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants