From: Nicolas Coden Date: Sat, 14 Apr 2018 20:15:04 +0000 (+0200) Subject: chore: move documentation changes to develop X-Git-Tag: v6.6.0~3^2~233^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9896d58dc;p=thirdparty%2Ffoundation%2Ffoundation-sites.git chore: move documentation changes to develop Signed-off-by: Nicolas Coden --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f6e462fea..d41473f05 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,7 @@ Before submitting a pull request, make sure it's targeting the right branch: -- For documentation fixes, use `master`. -- For bug fixes or new features compatible with the next version, use `develop`. -- For bug fixes incompatible with `develop`, use the support branch of the latest compatible version, which will be formatted `support/6.x`. +- For the latest version, use `develop`. +- For bug fixes incompatible with `develop`, use the support branch of the latest compatible and supported version `support/6.x`. If you're fixing a JavaScript issue, it would help to create a new test case under the folder `test/visual/` that recreates the issue and show's that it's been fixed. Run `npm test` to compile the testing folder. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6b6791d2..652fa21be 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,11 +25,11 @@ When you submit a pull request, @mention a few people you’d like to help you r ## Git Workflow Foundation uses a git workflow close to [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/). The workflow relies on three branches: -- **`master`**: The stable branch. It only contains the latest stable version released. Pull requests for docs improvements can be opened on it. -- **`develop`**: The developing branch is used to prepare the next minor/major version. It always contains all the new features and bug fixes previously made, and constitutes the most up-to-date version of Foundation. Almost every pull request should be opened on this branch. When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version. +- **`master`**: The stable branch. It only contains the latest stable version released. Do NOT open pull requests on it. +- **`develop`**: The developing branch is used to prepare the next minor/major version. It always contains all the new features and bug fixes previously made, and constitutes the most up-to-date version of Foundation. Almost every pull request should be opened on this branch (fixes, features, documentation...). When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version. - **`support/*`**: Support branches are used to support the previous versions (i.e. `support/6.3` for `v6.3.0`) and prepare patches (i.e. `v6.3.1`). When a bug fix is compatible with supported versions, it is also merged on their support branches and patch versions can be released. If a fix is not compatible with `develop`, a pull request can be opened on the latest compatible and supported version. -This git workflow was adopted as of `v6.3`, so `v6.2` and previous versions are not supported. +This git workflow was fully adopted as of `v6.5`, so `v6.4` and previous versions are not supported. ## Coding Standards diff --git a/gulp/tasks/docs.js b/gulp/tasks/docs.js index 7fffa7549..dc3592839 100644 --- a/gulp/tasks/docs.js +++ b/gulp/tasks/docs.js @@ -30,7 +30,7 @@ supercollider pageRoot: 'docs/pages', data: { repoName: 'foundation-sites', - editBranch: 'master' + editBranch: 'develop' } }) .searchConfig({