From 2ff5e4ba0599c0c96915b76b9a186e8a6ccd87fe Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sun, 5 May 2019 08:22:15 -0400 Subject: [PATCH] update issue templates and CONTRIBUTING.md --- .github/ISSUE_TEMPLATE/bugs.md | 2 ++ .github/ISSUE_TEMPLATE/request.md | 2 ++ .github/pull_request_template.md | 2 ++ CONTRIBUTING.md | 7 +++++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md index 82150487..8d0d4648 100644 --- a/.github/ISSUE_TEMPLATE/bugs.md +++ b/.github/ISSUE_TEMPLATE/bugs.md @@ -5,7 +5,9 @@ about: Report an issue for an egg --- Please fill out the information bellow and remove from the line up +If you just submit a bug with no info I will close out your bug. --------------- + Panel Version: (version number) Daemon Version: (version number) Service: (minecraft/factorio/etc) diff --git a/.github/ISSUE_TEMPLATE/request.md b/.github/ISSUE_TEMPLATE/request.md index e2122585..eb47a9bb 100644 --- a/.github/ISSUE_TEMPLATE/request.md +++ b/.github/ISSUE_TEMPLATE/request.md @@ -5,7 +5,9 @@ about: Suggest a server to build an egg for --- Please fill out the information bellow and remove from the line up +Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server) --------------- + Service: (Ex. minecraft/factorio/etc) Does this expand an already existing service: Y/N diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e70890ce..8285664e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,6 +2,8 @@ * [ ] Have you followed the guidelines in our Contributing document? * [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change? +* [ ] Did you branch your changes and PR from that branch and not from your master branch? + * If not, why?: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58a857fb..9662ccc9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,6 +11,9 @@ 3. Try to stay in the stock containers. If you need something in a container PR it to [my image repo](https://github.com/parkervcp/images) where I can review and pull up to the main repo. +4. Don't be afraid to submit PR's to the egg repo. + I dont bite. I will work with you on the egg and the required things to run it. + ## Step 1. #### Be aware of the pterodactyl install process. @@ -38,6 +41,6 @@ This is to maintain a clean repo that others can pull and be fully aware of what ## Step 3. -#### Don't be afraid to submit PR's to the egg repo. +#### Make a branch and do your work in there. -I dont bite. I will work with you on the egg and the required things to run it. +I have been getting messy PR's due to people always PRing from their master branch. Please make a branch and PR from there,