From 282dd1bbc7e490ed00ffef39f60b5e907b944f0b Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 2 Apr 2021 21:41:36 +0200
Subject: [PATCH] Drop deprecated `issue_body` from issue forms

This change removes the deprecated attribute and also adds an explicit
textarea at the end of the docs report form to replace it.
---
 .github/ISSUE_TEMPLATE/bug_report.yml         |  1 -
 .../ISSUE_TEMPLATE/documentation_report.yml   | 31 +++++++++----------
 .github/ISSUE_TEMPLATE/feature_request.yml    |  1 -
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3b5341c56a0..9ae169ed821 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,6 @@
 ---
 name: 🐛 Bug report
 description: Create a report to help us improve
-issue_body: false  # default: true, adds a classic WSYWIG textarea, if on
 
 body:
 - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/documentation_report.yml b/.github/ISSUE_TEMPLATE/documentation_report.yml
index ff22a16db33..8a82bb106ac 100644
--- a/.github/ISSUE_TEMPLATE/documentation_report.yml
+++ b/.github/ISSUE_TEMPLATE/documentation_report.yml
@@ -1,8 +1,6 @@
 ---
 name: 📝 Documentation Report
 description: Ask us about docs
-# NOTE: issue body is enabled to allow screenshots
-issue_body: true  # default: true, adds a classic WSYWIG textarea, if on
 
 body:
 - type: markdown
@@ -87,23 +85,10 @@ body:
     required: true
 
 
-- type: checkboxes
+- type: textarea
   attributes:
-    label: Code of Conduct
+    label: Additional Information
     description: |
-      Read the [Ansible Code of Conduct][CoC] first.
-
-      [CoC]: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_form--documentation_report.yml
-    options:
-    - label: I agree to follow the Ansible Code of Conduct
-      required: true
-
-
-- type: markdown
-  attributes:
-    value: |
-      **Additional Information**
-
       Describe how this improves the documentation, e.g. before/after situation or screenshots.
 
       **HINT:** You can paste https://gist.github.com links for larger files.
@@ -112,4 +97,16 @@ body:
       to understand X.
   validations:
     required: true
+
+
+- type: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [Ansible Code of Conduct][CoC] first.
+
+      [CoC]: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_form--documentation_report.yml
+    options:
+    - label: I agree to follow the Ansible Code of Conduct
+      required: true
 ...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 01ad4456c51..e43616217ee 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,6 @@
 ---
 name: ✨ Feature request
 description: Suggest an idea for this project
-issue_body: false  # default: true, adds a classic WSYWIG textarea, if on
 
 body:
 - type: markdown