From 82a4ec9cbde1a42d7c41f537a024cb3b8d45eb87 Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sat, 17 Jul 2021 12:00:38 +0200 Subject: [PATCH 1/5] Add more detailed issue templates Shamelessly stolen from https://github.com/HedgeDoc/client Originally written by https://github.com/ErikMichelson and https://github.com/DerMolly --- .gitlab/issue_templates/Bug Report.md | 48 ++++++++++++++++++++++ .gitlab/issue_templates/Feature Request.md | 28 +++++++++++++ .gitlab/issue_templates/Issue Template.md | 15 ------- 3 files changed, 76 insertions(+), 15 deletions(-) create mode 100644 .gitlab/issue_templates/Bug Report.md create mode 100644 .gitlab/issue_templates/Feature Request.md delete mode 100644 .gitlab/issue_templates/Issue Template.md diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md new file mode 100644 index 0000000..3fdc303 --- /dev/null +++ b/.gitlab/issue_templates/Bug Report.md @@ -0,0 +1,48 @@ + + +### Description + + + + +### To Reproduce + + + + +### Expected behavior + + + + +### Error/Log + +```log +Copy and paste the error log from Conduit here. +``` + + +### Your Setup (please complete the following information): + +- Conduit version [e.g. Git commit at download time] +- OS: [e.g. Raspbian , Ubuntu 20.04, ...] +- RAM available to Conduit: [e.g. 1 GB] +- Cores available to Conduit: [e.g. 1 Core] + + +### Additional context + + + + +/label ~conduit diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md new file mode 100644 index 0000000..4100eb6 --- /dev/null +++ b/.gitlab/issue_templates/Feature Request.md @@ -0,0 +1,28 @@ + + + +### Is your feature request related to a problem? Please describe. + + + + +### Describe the solution you'd like + + + + +### Describe alternatives you've considered + + + + +### Additional context + + + + + +/label ~conduit diff --git a/.gitlab/issue_templates/Issue Template.md b/.gitlab/issue_templates/Issue Template.md deleted file mode 100644 index e1a0667..0000000 --- a/.gitlab/issue_templates/Issue Template.md +++ /dev/null @@ -1,15 +0,0 @@ -# Headline - -### Description - - - - - - - - - - - -/label ~conduit From 7054f74783effdb96733c38b65e2f4f315ec2fd6 Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sat, 17 Jul 2021 12:09:50 +0200 Subject: [PATCH 2/5] Add issue template for GitHub which redirects to Gitlab --- .github/ISSUE_TEMPLATE/Issue.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/Issue.md diff --git a/.github/ISSUE_TEMPLATE/Issue.md b/.github/ISSUE_TEMPLATE/Issue.md new file mode 100644 index 0000000..9022062 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Issue.md @@ -0,0 +1,11 @@ +--- +name: "Issue with / Feature Request for Conduit" +about: "Please file issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new" +title: "CLOSE ME" +--- + + + +**⚠️ Conduit development does not happen on GitHub. Issues opened here will not be addressed** + +Please open issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new \ No newline at end of file From 5d8ad4fd72bf9a5a06c14b1624432ce52b59cbe6 Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sat, 17 Jul 2021 12:22:11 +0200 Subject: [PATCH 3/5] Add some more details to the MR template --- .gitlab/merge_request_templates/MR.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitlab/merge_request_templates/MR.md diff --git a/.gitlab/merge_request_templates/MR.md b/.gitlab/merge_request_templates/MR.md new file mode 100644 index 0000000..cf3c09e --- /dev/null +++ b/.gitlab/merge_request_templates/MR.md @@ -0,0 +1,8 @@ + + + +----------------------------------------------------------------------------- + +- [ ] I ran `cargo fmt --all`, `cargo test --workspace` and `cargo clippy` +- [ ] I agree to release my code and all other changes of this MR under the Apache-2.0 license + From 092221ca3f9c10eb66672b61bbadc15e8bfea7ab Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sun, 18 Jul 2021 20:30:57 +0000 Subject: [PATCH 4/5] Reduce amount of text in Bug Report template --- .gitlab/issue_templates/Bug Report.md | 41 ++++----------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md index 3fdc303..3e66d43 100644 --- a/.gitlab/issue_templates/Bug Report.md +++ b/.gitlab/issue_templates/Bug Report.md @@ -2,47 +2,18 @@ If you're requesting a new feature, that isn't part of this project yet, then please consider filling out a "Feature Request" instead! -If you just have trouble setting up a conduit server or other questions, feel free to ask for help in the +If you need a hand setting up your conduit server, feel free to ask for help in the Conduit Matrix Chat: https://matrix.to/#/#conduit:fachschaften.org. --> ### Description + - +### System Configuration + - -### To Reproduce - - - - -### Expected behavior - - - - -### Error/Log - -```log -Copy and paste the error log from Conduit here. -``` - - -### Your Setup (please complete the following information): - -- Conduit version [e.g. Git commit at download time] -- OS: [e.g. Raspbian , Ubuntu 20.04, ...] -- RAM available to Conduit: [e.g. 1 GB] -- Cores available to Conduit: [e.g. 1 Core] - - -### Additional context - - +Conduit Version: +Database backend (default is sqlite): sqlite /label ~conduit From cdd01262d23e92b445cbb757005278358a6097d8 Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sun, 18 Jul 2021 20:43:21 +0000 Subject: [PATCH 5/5] Shorten more templates --- .github/ISSUE_TEMPLATE/Issue.md | 2 +- .gitlab/issue_templates/Feature Request.md | 13 +------------ .gitlab/merge_request_templates/MR.md | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Issue.md b/.github/ISSUE_TEMPLATE/Issue.md index 9022062..7889665 100644 --- a/.github/ISSUE_TEMPLATE/Issue.md +++ b/.github/ISSUE_TEMPLATE/Issue.md @@ -8,4 +8,4 @@ title: "CLOSE ME" **⚠️ Conduit development does not happen on GitHub. Issues opened here will not be addressed** -Please open issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new \ No newline at end of file +Please open issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md index 4100eb6..3f636e7 100644 --- a/.gitlab/issue_templates/Feature Request.md +++ b/.gitlab/issue_templates/Feature Request.md @@ -6,22 +6,11 @@ then please consider filling out a "Bug Report" instead! ### Is your feature request related to a problem? Please describe. - + ### Describe the solution you'd like - - - -### Describe alternatives you've considered - - - - -### Additional context - - diff --git a/.gitlab/merge_request_templates/MR.md b/.gitlab/merge_request_templates/MR.md index cf3c09e..c592a3b 100644 --- a/.gitlab/merge_request_templates/MR.md +++ b/.gitlab/merge_request_templates/MR.md @@ -1,8 +1,8 @@ - + ----------------------------------------------------------------------------- -- [ ] I ran `cargo fmt --all`, `cargo test --workspace` and `cargo clippy` +- [ ] I ran `cargo fmt` and `cargo test` - [ ] I agree to release my code and all other changes of this MR under the Apache-2.0 license