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

Make changes to circle config synchroneous #1307

Merged
merged 1 commit into from May 9, 2023
Merged

Conversation

mejo-
Copy link
Member

@mejo- mejo- commented May 9, 2023

Required for Collectives to allow unflagging a circle as app managed and delete the circle in the same request.

Required for Collectives to allow unflagging a circle as app managed and
delete the circle in the same request.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo- mejo- requested a review from ArtificialOwl May 9, 2023 16:36
@mejo- mejo- marked this pull request as ready for review May 9, 2023 16:36
@mejo-
Copy link
Member Author

mejo- commented May 9, 2023

/backport to stable26

@mejo-
Copy link
Member Author

mejo- commented May 9, 2023

/backport to stable25

@mejo- mejo- merged commit b1c1005 into master May 9, 2023
17 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix/circle_config_synchron branch May 9, 2023 20:58
@backportbot-nextcloud
Copy link

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

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

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

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

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

@mejo-
Copy link
Member Author

mejo- commented May 9, 2023

/backport 7f75525 to stable26

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.

None yet

2 participants