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

Backport/stable26/jerome herbinet/patch 15 #37431

Merged
merged 2 commits into from
Mar 28, 2023

Conversation

artonge
Copy link
Contributor

@artonge artonge commented Mar 27, 2023

Manual backport of #37380

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
@artonge artonge requested review from szaimen, a team, skjnldsv and Pytal and removed request for a team March 27, 2023 16:17
@artonge artonge self-assigned this Mar 27, 2023
@artonge artonge added this to the Nextcloud 26.0.1 milestone Mar 27, 2023
@artonge artonge changed the base branch from master to stable26 March 27, 2023 16:18
@artonge
Copy link
Contributor Author

artonge commented Mar 27, 2023

/backport to stable25

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
@artonge artonge force-pushed the backport/stable26/Jerome-Herbinet/patch-15 branch from 1bb83bf to f0603d3 Compare March 27, 2023 16:19
@artonge artonge marked this pull request as ready for review March 27, 2023 16:19
@artonge artonge enabled auto-merge March 27, 2023 16:26
@artonge
Copy link
Contributor Author

artonge commented Mar 28, 2023

CI error unrelated

@artonge artonge disabled auto-merge March 28, 2023 09:08
@artonge artonge merged commit d63f20f into stable26 Mar 28, 2023
@artonge artonge deleted the backport/stable26/Jerome-Herbinet/patch-15 branch March 28, 2023 09:08
@backportbot-nextcloud
Copy link

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

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

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

# 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-stable25

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

@skjnldsv skjnldsv mentioned this pull request Apr 13, 2023
8 tasks
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