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

Release v4.2.0 #39

Merged
merged 8 commits into from
Nov 16, 2022
Merged

Release v4.2.0 #39

merged 8 commits into from
Nov 16, 2022

Conversation

robbot006
Copy link
Collaborator

@robbot006 robbot006 commented Sep 19, 2022

This is a draft of changelog for the v4.2.0 release.
Here you can find all related translations changes: v4.1.0...master.

⚠️ Do not merge this pull request manually ⚠️

You should approve this pull request instead. After approving, I will automatically update it (release date needs to be adjusted), merge, and tag a new release. You can read more about the process on forum.

Show release notes preview

v4.2.0

Modifications générales:

  • Mise à jour des traductions du noyau de Flarum.

Prise en charge de nouvelles extensions:

Mise à jour des traductions de certaines extensions:

Journal de toutes les modifications : v4.1.0...v4.2.0.

@robbot006 robbot006 changed the title Release v4.1.1 Release v4.2.0 Nov 16, 2022
@qiaeru qiaeru marked this pull request as ready for review November 16, 2022 10:58
@qiaeru qiaeru merged commit 9305235 into master Nov 16, 2022
@qiaeru qiaeru deleted the release/master branch November 16, 2022 10:59
@qiaeru qiaeru restored the release/master branch November 16, 2022 11:03
@qiaeru qiaeru deleted the release/master branch November 16, 2022 11:07
@rob006
Copy link
Contributor

rob006 commented Nov 16, 2022

@qiaeru Please do no merge these PRs manually, the workflow is explained in the first comment.

@qiaeru
Copy link
Collaborator

qiaeru commented Nov 16, 2022

@qiaeru Please do no merge these PRs manually, the workflow is explained in the first comment.

Yeah I forgot to not delete the release/master branch after the merge, my bad. 😵

@rob006
Copy link
Contributor

rob006 commented Nov 16, 2022

Yeah I forgot to not delete the release/master branch after the merge, my bad. dizzy_face

If you merge this PR manually, you need to delete this branch. In other case bot still will be pushing to old branch and it may result some conflicts with new PR (or it may never open new PR - I never tested this). But you should not merge this PR in the first place - just approve it and bot will handle the rest of release process.

@qiaeru
Copy link
Collaborator

qiaeru commented Nov 16, 2022

Yeah I forgot to not delete the release/master branch after the merge, my bad. dizzy_face

If you merge this PR manually, you need to delete this branch. In other case bot still will be pushing to old branch and it may result some conflicts with new PR (or it may never open new PR - I never tested this). But you should not merge this PR in the first place - just approve it and bot will handle the rest of release process.

Yep, I reviewed and approved the PR, I didn't merged it manually, but I deleted the branch before the bot did it. My bad. I will wait in the future, like previous releases.

@rob006
Copy link
Contributor

rob006 commented Nov 16, 2022

Yep, I reviewed and approved the PR, I didn't merged it manually, but I deleted the branch before the bot did it. My bad. I will wait in the future, like previous releases.

Are you sure? According to timeline you merged this PR manually without review:

ed4cf617

Are you sure you did not confused some options :P.

@qiaeru
Copy link
Collaborator

qiaeru commented Nov 16, 2022

Yep I'm pretty sure. I clicked to review, to approve, then I deleted manually the branch. But heh I'm tired so I don't trust my brain anymore, the timeline don't lie. 😁

Sorry anyway!

@rob006
Copy link
Contributor

rob006 commented Nov 16, 2022

If you have any idea how to improve this workflow, I'm open for suggestions. You're not the first person who merged PR instead of approving it, so this is real UX problem, but I don't see an easy option to block manual merges. :/

@qiaeru
Copy link
Collaborator

qiaeru commented Nov 16, 2022

No that's fine, you documented it very well. Translators are not very smart that's all. 😊

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.

4 participants