From c46f29b3b684e59760a5418128ade5a4d900434a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 19 Nov 2019 09:10:38 +0545 Subject: [PATCH] Adjust .github files --- .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 7 ++----- .github/issue_template.md | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c77a42579cb1..4c9e99a3892f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,7 +37,7 @@ Before we're able to merge your code into the ownCloud core, you need to sign ou Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the ownCloud code with PHPUnit. -In order to constantly increase the quality of our software we can no longer accept pull request which submit un-tested code. +In order to constantly increase the quality of our software we can no longer accept pull requests which submit un-tested code. It is a must have that changed and added code segments are unit tested. In some areas unit testing is hard (aka almost impossible) as of today - in these areas refactoring WHILE fixing a bug is encouraged to enable unit testing. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d4eb857c7785..e1984fcb1bb4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,14 +7,11 @@ For fixing potential security issues please see https://owncloud.org/security/ To make it possible for us to get your change reviewed and merged please carefully fill out the requested information below. -Please note that any kind of change needs first be submitted to the master branch which holds the next major version of ownCloud. - -We will carefully discuss if your change can or has to be backported to stable branches. +Please note that any kind of change needs first be submitted to the master branch which holds the next version of ownCloud. Please set the following labels: -- Set label "3 - To review" for review or "2 - Development" in case the PR still has open tasks -- Set label "backport-request" if backport is needed +- Set label "3 - To review" for review or "2 - Development" if the PR still has open tasks - Assignment: assign to self - Milestone: set the same as the ticket this PR fixes, or "development" by default - Reviewers: pick at least one diff --git a/.github/issue_template.md b/.github/issue_template.md index cf1d389262c8..764768745a2b 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -7,7 +7,7 @@ For reporting potential security issues please see https://owncloud.org/security To make it possible for us to help you please fill out below information carefully. -Before reporting any issues please make sure that you're using the latest available version for your major branch (e.g. 9.0.x), see https://owncloud.org/changelog/ +Before reporting any issues please make sure that you're using the latest available version of ownCloud, see https://owncloud.org/changelog/ --> ### Steps to reproduce 1.