From f9570b132f1b66944476af496d2b7b1ad55cb60b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 29 Aug 2025 14:25:02 +0300 Subject: [PATCH] frontend-specifics --- .gitlab/merge_request_templates/Release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md index e57556e6c..d02e14a73 100644 --- a/.gitlab/merge_request_templates/Release.md +++ b/.gitlab/merge_request_templates/Release.md @@ -1,8 +1,8 @@ ### Release checklist -* [ ] Bump version in `mix.exs` +* [ ] Bump version in `package.json` * [ ] Compile a changelog with the `tools/collect-changelog` script * [ ] Create an MR with an announcement to pleroma.social #### post-merge * [ ] Tag the release on the merge commit * [ ] Make the tag into a Gitlab Release™ -* [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs) +* [ ] Merge `master` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)