Merge remote-tracking branch 'origin/master'

.github/ISSUE_TEMPLATE/ask-for-help.yaml

@@ -1,8 +1,23 @@
 name: "❓ Ask for help"
 description: "Submit any question related to Uptime Kuma"
-title: "[Help]: <title>"
+title: "[Help] "
 labels: [help]
 body:
+  - type: checkboxes
+    id: no-duplicate-issues
+    attributes:
+      label: "⚠️ Please verify that this bug has NOT been raised before."
+      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+      options:
+        - label: "I checked and didn't find similar issue"
+          required: true
+  - type: checkboxes
+    attributes:
+      label: "🛡️ Security Policy"
+      description: Please review the security policy before reporting security related issues/bugs.
+      options:
+        - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
+          required: true
   - type: textarea
     id: steps-to-reproduce
     validations:
@@ -14,17 +29,17 @@ body:
   - type: input
     id: uptime-kuma-version
     attributes:
-      label: "🐻 Uptime-Kuma version"
+      label: "🐻 Uptime-Kuma Version"
-      description: "Which version of Uptime-Kuma are you running?"
+      description: "Which version of Uptime-Kuma are you running? Please do NOT provide the docker tag such as latest or 1"
-      placeholder: "Ex. 1.9.x"
+      placeholder: "Ex. 1.10.0"
     validations:
       required: true
   - type: input
     id: operating-system
     attributes:
-      label: "💻 Operating System"
+      label: "💻 Operating System and Arch"
       description: "Which OS is your server/device running on?"
-      placeholder: "Ex. Ubuntu 20.04"
+      placeholder: "Ex. Ubuntu 20.04 x86"
     validations:
       required: true
   - type: input
@@ -32,23 +47,15 @@ body:
     attributes:
       label: "🌐 Browser"
       description: "Which browser are you running on?"
-      placeholder: "Ex. Firefox"
+      placeholder: "Ex. Google Chrome 95.0.4638.69"
     validations:
       required: true
   - type: input
     id: docker-version
     attributes:
-      label: "🐋 Docker"
+      label: "🐋 Docker Version"
       description: "If running with Docker, which version are you running?"
-      placeholder: "Ex. 20.10.9"
+      placeholder: "Ex. Docker 20.10.9 / K8S / Podman"
-    validations:
-      required: false
-  - type: input
-    id: docker-image-tag
-    attributes:
-      label: "🏷️ Docker Image Tag"
-      description: "Which Docker image tag are you using? If running '1' or 'latest', please specify image hash."
-      placeholder: "Ex. 1.9.1"
     validations:
       required: false
   - type: input
@@ -56,21 +63,6 @@ body:
     attributes:
       label: "🟩 NodeJS Version"
       description: "If running with Node.js? which version are you running?"
-      placeholder: "14.x"
+      placeholder: "Ex. 14.18.0"
     validations:
       required: false
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "⚠️ Please verify that this question has NOT been raised before."
-      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
-      options:
-        - label: "I checked and didn't find similar question"
-          required: true
-  - type: checkboxes
-    attributes:
-      label: "🛡️ Security Policy"
-      description: Please review the security policy before reporting security related issues/bugs.
-      options:
-        - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
-          required: true

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,88 +1,8 @@
 name: "🐛 Bug Report"
 description: "Submit a bug report to help us improve"
-title: "[Bug]: <title>"
+title: "[Bug] "
 labels: [bug]
 body:
-  - type: textarea
-    id: steps-to-reproduce
-    validations:
-      required: true
-    attributes:
-      label: "👟 Reproduction steps"
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      placeholder: "..."
-  - type: textarea
-    id: expected-behavior
-    validations:
-      required: true
-    attributes:
-      label: "👍 Expected behavior"
-      description: "What did you think would happen?"
-      placeholder: "..."
-  - type: textarea
-    id: actual-behavior
-    validations:
-      required: true
-    attributes:
-      label: "👎 Actual Behavior"
-      description: "What actually happen?"
-      placeholder: "..."
-  - type: input
-    id: uptime-kuma-version
-    attributes:
-      label: "🐻 Uptime-Kuma version"
-      description: "Which version of Uptime-Kuma are you running?"
-      placeholder: "Ex. 1.9.x"
-    validations:
-      required: true
-  - type: input
-    id: operating-system
-    attributes:
-      label: "💻 Operating System"
-      description: "Which OS is your server/device running on?"
-      placeholder: "Ex. Ubuntu 20.04"
-    validations:
-      required: true
-  - type: input
-    id: browser-vendor
-    attributes:
-      label: "🌐 Browser"
-      description: "Which browser are you running on?"
-      placeholder: "Ex. Firefox"
-    validations:
-      required: true
-  - type: input
-    id: docker-version
-    attributes:
-      label: "🐋 Docker"
-      description: "If running with Docker, which version are you running?"
-      placeholder: "Ex. 20.10.9"
-    validations:
-      required: false
-  - type: input
-    id: docker-image-tag
-    attributes:
-      label: "🏷️ Docker Image Tag"
-      description: "Which Docker image tag are you using? If running '1' or 'latest', please specify image hash."
-      placeholder: "Ex. 1.9.1"
-    validations:
-      required: false
-  - type: input
-    id: nodejs-version
-    attributes:
-      label: "🟩 NodeJS Version"
-      description: "If running with Node.js? which version are you running?"
-      placeholder: "14.x"
-    validations:
-      required: false
-  - type: textarea
-    id: logs
-    attributes:
-      label: "📝 Relevant log output"
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-    validations:
-      required: false
   - type: checkboxes
     id: no-duplicate-issues
     attributes:
@@ -98,3 +18,82 @@ body:
       options:
         - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
           required: true
+  - type: textarea
+    id: description
+    validations:
+      required: false
+    attributes:
+      label: "Description"
+      description: "You could also upload screenshots"
+  - type: textarea
+    id: steps-to-reproduce
+    validations:
+      required: true
+    attributes:
+      label: "👟 Reproduction steps"
+      description: "How do you trigger this bug? Please walk us through it step by step."
+      placeholder: "..."
+  - type: textarea
+    id: expected-behavior
+    validations:
+      required: true
+    attributes:
+      label: "👀 Expected behavior"
+      description: "What did you think would happen?"
+      placeholder: "..."
+  - type: textarea
+    id: actual-behavior
+    validations:
+      required: true
+    attributes:
+      label: "😓 Actual Behavior"
+      description: "What actually happen?"
+      placeholder: "..."
+  - type: input
+    id: uptime-kuma-version
+    attributes:
+      label: "🐻 Uptime-Kuma Version"
+      description: "Which version of Uptime-Kuma are you running? Please do NOT provide the docker tag such as latest or 1"
+      placeholder: "Ex. 1.10.0"
+    validations:
+      required: true
+  - type: input
+    id: operating-system
+    attributes:
+      label: "💻 Operating System and Arch"
+      description: "Which OS is your server/device running on?"
+      placeholder: "Ex. Ubuntu 20.04 x86"
+    validations:
+      required: true
+  - type: input
+    id: browser-vendor
+    attributes:
+      label: "🌐 Browser"
+      description: "Which browser are you running on?"
+      placeholder: "Ex. Google Chrome 95.0.4638.69"
+    validations:
+      required: true
+  - type: input
+    id: docker-version
+    attributes:
+      label: "🐋 Docker Version"
+      description: "If running with Docker, which version are you running?"
+      placeholder: "Ex. Docker 20.10.9 / K8S / Podman"
+    validations:
+      required: false
+  - type: input
+    id: nodejs-version
+    attributes:
+      label: "🟩 NodeJS Version"
+      description: "If running with Node.js? which version are you running?"
+      placeholder: "Ex. 14.18.0"
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: "📝 Relevant log output"
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,8 +1,16 @@
 name: 🚀 Feature Request
 description: "Submit a proposal for a new feature"
-title: "[Feature]: <title>"
+title: "[Feature] "
 labels: [enhancement]
 body:
+  - type: checkboxes
+    id: no-duplicate-issues
+    attributes:
+      label: "⚠️ Please verify that this feature request has NOT been suggested before."
+      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+      options:
+        - label: "I checked and didn't find similar feature request"
+          required: true
   - type: dropdown
     id: feature-area
     attributes:
@@ -49,11 +57,3 @@ body:
       label: "📝 Additional Context"
       description: "Add any other context or screenshots about the feature request here."
       placeholder: "..."
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "⚠️ Please verify that this feature request has NOT been suggested before."
-      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
-      options:
-        - label: "I checked and didn't find similar feature request"
-          required: true

SECURITY.md

@@ -1,5 +1,11 @@
 # Security Policy
 
+## Reporting a Vulnerability
+
+Please report security issues to uptime@kuma.pet.
+
+Do not use the issue tracker or discuss it in the public as it will cause more damage.
+
 ## Supported Versions
 
 Use this section to tell people about which versions of your project are
@@ -23,9 +29,3 @@ currently being supported with security updates.
 | debian | :white_check_mark: |
 | alpine | :white_check_mark: |
 | All other tags  | ❌ |
-
-## Reporting a Vulnerability
-
-Please report security issues to uptime@kuma.pet.
-
-Do not use the issue tracker or discuss it in the public as it will cause more damage.