From 71f5a4f735a7ae6e8bc0e7708edc4d22a31d88bd Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Tue, 6 Jun 2017 02:05:59 +0200
Subject: [PATCH] DevKit updates

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 ++
 CONTRIBUTING.md                  | 7 ++++++-
 README.md                        | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9ec12ce..323e757 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,6 +9,8 @@
 -->
 I am targeting this branch, because {reason}.
 
+In case of bug fix, `master` **MUST** be targeted.
+
 <!--
     Specify which issues will be fixed/closed.
     Remove it if this is not related.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f23b7c8..b2ac2de 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -191,6 +191,7 @@ Here is a short table resuming on which you have to start:
 Kind of modification | Backward Compatible (BC) | Type of release | Branch to target        | Label |
 -------------------- | ------------------------ | --------------- | ----------------------- | ----- |
 Bug fixes            | Yes                      | Patch           | `master`   | |
+Bug fixes            | Not on legacy            | Patch           | `master`   | |
 Bug fixes            | No (Only if no choice)   | Major           | `master` | |
 Feature              | Yes                      | Minor           | `master`   | |
 Feature              | No (Only if no choice)   | Major           | `master` | |
@@ -198,8 +199,12 @@ Deprecation          | Yes (Have to)            | Minor           | `master`   |
 Deprecation removal  | No (Can't be)            | Major           | `master` | |
 
 Notes:
+  * Branch `master` is the branch of the **latest stable** patch releases and
+  has to be used for Backward Compatible bug fixes only.
   * Branch `master` is the branch of the **latest stable** minor release and
-  has to be used for Backward compatible PRs.
+  has to be used for Backward compatible enhancement PRs.
+  **No bug fix will be accepted here**, except if the bug fix concerns `master` and **only this one**.
+  Bug fixes merged on `master` will be ported on other branches by fallback merging.
   * If you PR is not **Backward Compatible** but can be, it **must** be:
     * Changing a function/method signature? Prefer create a new one and deprecate the old one.
     * Code deletion? Don't. Please deprecate it instead.
diff --git a/README.md b/README.md
index 22decd0..008ca5e 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Provides a Dashboard management through container and block services
 
 Branch | Travis | Coveralls |
 ------ | ------ | --------- |
+master   | [![Build Status][travis_legacy_badge]][travis_legacy_link]     | [![Coverage Status][coveralls_legacy_badge]][coveralls_legacy_link]     |
 master   | [![Build Status][travis_stable_badge]][travis_stable_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     |
 master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
 
@@ -30,11 +31,15 @@ If you think you found a bug or you have a feature idea to propose, feel free to
 
 This package is available under the [MIT license](LICENSE).
 
+[travis_legacy_badge]: https://travis-ci.org/sonata-project/SonataDashboardBundle.svg?branch=master
+[travis_legacy_link]: https://travis-ci.org/sonata-project/SonataDashboardBundle
 [travis_stable_badge]: https://travis-ci.org/sonata-project/SonataDashboardBundle.svg?branch=master
 [travis_stable_link]: https://travis-ci.org/sonata-project/SonataDashboardBundle
 [travis_unstable_badge]: https://travis-ci.org/sonata-project/SonataDashboardBundle.svg?branch=master
 [travis_unstable_link]: https://travis-ci.org/sonata-project/SonataDashboardBundle
 
+[coveralls_legacy_badge]: https://coveralls.io/repos/github/sonata-project/SonataDashboardBundle/badge.svg?branch=master
+[coveralls_legacy_link]: https://coveralls.io/github/sonata-project/SonataDashboardBundle?branch=master
 [coveralls_stable_badge]: https://coveralls.io/repos/github/sonata-project/SonataDashboardBundle/badge.svg?branch=master
 [coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataDashboardBundle?branch=master
 [coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataDashboardBundle/badge.svg?branch=master