From: Dan Untenzu <untenzu@webit.de>
Date: Thu, 23 Feb 2017 15:30:15 +0000 (+0100)
Subject: [FEATURE] Docs: Note steps to prepare new releases
X-Git-Tag: 3.0.0~2
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/16f840d39d2da77131be7460df1d5092c2fb12f9?ds=inline

[FEATURE] Docs: Note steps to prepare new releases

Write down all required steps for new releases.

Refs #104 #109
---

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7f21ed..94bdac5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -84,3 +84,14 @@ Quick walktrough:
 * Feature is reviewed
   * MR accepted: Reviewer checks out »next-release« branch and cherry-picks the commit ```git checkout next-release; git cherry-pick be4369641; git push```
   * MR declined: Reviewer add some notes, Developer rebases his branch, adds neccessary changes, force pushes the branch, ask a reviewer to review the changes in the merge request ticket (as Gitlab recognizes them automatically) ```git checkout some-feature; git rebase upstream/next-release``` …[add changes]… ```git add -A, git commit --amend; git push -f```
+
+## New Releases
+
+* Compare the [»next-release« branch to »master«](https://gitlab.com/mojo42/Jirafeau/compare/master...next-release)
+* Add a list of noteworthy features and bugfixes to the README
+* Change the version, using [semantic versioning](http://semver.org/), in ```settings.php```
+* Merge »next-release« branch to »master«
+* Update the demo page
+* Tag the »master« with the new version
+* Push branch and tag
+* Dance a little