Issue template - Update "Environment"; combine type+version fields

We want "versions" for everything. Making separate lines for the version just makes it bit
harder to write (you have to remove more things) and to read (you have to skim more lines).

Changes:

* Combine "CMS/CMS Version"
* Combine "Database/Database Version"
* For "Web Server", also include version.
* Add "PHP"

diff --git a/.gitlab/issue_templates/general-bug-or-issue.md b/.gitlab/issue_templates/general-bug-or-issue.md
index 94fe5590c9f4fd9c2f3e08fc48b5c94d45e90727..bc2ecdde1458f314972a01e17c611ca627d81758 100644 (file)
--- a/.gitlab/issue_templates/general-bug-or-issue.md
+++ b/.gitlab/issue_templates/general-bug-or-issue.md
@@ -23,13 +23,12 @@ Environment information:
 
 <!-- Some of the items below may not be relevant for every bug - if in doubt please include more information than you think is neccessary. -->
 
-* __Browser & Version:__ _Firefox 59.0.1/Chrome 78.0.3904/Safari 13_
-* __CiviCRM Version:__ _Master/5.20.0/5.19.1/5.18.2/..._
-* __CMS:__ _Backdrop/Drupal/Joomla/WordPress_
-* __CMS Version:__ _1.0/4.5/6.10/7.30/..._
-* __Database:__ _MariaDB/MySQL/Percona/Other_
-* __Database Versions:__ _5.5/5.7/10.3/10.4/..._
-* __Web Server:__ _Apache/LiteSpeed/Nginx/..._
+* __Browser:__ _Firefox 59.0.1/Chrome 78.0.3904/Safari 13_
+* __CiviCRM:__ _Master/5.20.0/5.19.1/5.18.2/..._
+* __PHP:__ _7.0/7.1/7.2/7.3/...__
+* __CMS:__ _Backdrop 1.5/Drupal 7.30/Joomla 3.3/WordPress 4.5/..._
+* __Database:__ _MySQL 5.7.7/MariaDB 10.4/..._
+* __Web Server:__ _Apache 2.4/Nginx 1.16/..._
 
 Comments
 ----------------------------------------