Skip to content

Conversation

@artonge
Copy link
Collaborator

@artonge artonge commented May 22, 2023

Manual backport of #1178

@artonge artonge self-assigned this May 22, 2023
@artonge artonge added this to the Nextcloud 26.0.3 milestone May 22, 2023
@artonge artonge requested a review from miaulalala May 22, 2023 10:47
@artonge
Copy link
Collaborator Author

artonge commented May 22, 2023

/backport to stable27

@artonge
Copy link
Collaborator Author

artonge commented May 22, 2023

/backport to stable25

@artonge
Copy link
Collaborator Author

artonge commented May 22, 2023

/backport to stable24

@blizzz
Copy link
Member

blizzz commented Jun 13, 2023

conflicts, and needs a review

@blizzz
Copy link
Member

blizzz commented Jun 15, 2023

moving to 26.0.4

@artonge
Copy link
Collaborator Author

artonge commented Jun 27, 2023

/rebase

Signed-off-by: Louis Chemineau <[email protected]>
@artonge artonge force-pushed the backport/stable26/artonge/tests/reenabled_cypress branch from 702f25f to 319af3c Compare June 27, 2023 08:08
Signed-off-by: Louis Chemineau <[email protected]>
@artonge artonge force-pushed the backport/stable26/artonge/tests/reenabled_cypress branch from 319af3c to ecdd94c Compare June 27, 2023 08:56
@miaulalala miaulalala requested review from skjnldsv and removed request for miaulalala June 27, 2023 11:04
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

See comments :)

Signed-off-by: Louis Chemineau <[email protected]>
@artonge artonge force-pushed the backport/stable26/artonge/tests/reenabled_cypress branch from 7f884e5 to 010d4cf Compare June 27, 2023 12:39
Signed-off-by: Louis Chemineau <[email protected]>
@skjnldsv
Copy link
Member

@artonge I didn't see this was a backport, my changes should also be upstreamed to 27 and master :)

@artonge
Copy link
Collaborator Author

artonge commented Jun 27, 2023

@artonge I didn't see this was a backport, my changes should also be upstreamed to 27 and master :)

Changes are already in 27 and master, I actually copy-pasted the master's version here ;)

@artonge artonge merged commit 54d37be into stable26 Jun 27, 2023
@artonge artonge deleted the backport/stable26/artonge/tests/reenabled_cypress branch June 27, 2023 16:59
@backportbot-nextcloud
Copy link

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

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

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

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

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

@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

@backportbot-nextcloud
Copy link

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

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

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

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

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

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