Merge branch '2.1.0-develop' into issue-304

Author: drpayyne

.github/ISSUE_TEMPLATE/bug_report.md

@@ -39,9 +39,9 @@ If applicable, add screenshots to help explain your problem.
 
 **Please complete the following information:** (*) 
 
- - OS: [e.g. iOS]
- - PhpStorm/Intellij version [e.g. 2019.3.3]
- - Version [e.g. 1.0.0]
+ - OS: [e.g. MacOS or Ubuntu Linux 20.04]
+ - PhpStorm/Intellij version: [e.g. 2019.3.3]
+ - Plugin Version: [e.g. 1.0.0]
 
 **Additional context**
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,7 +20,7 @@
     If relevant, please provide a list of fixed issues in the format magento/magento2-phpstorm-plugin#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
-1. magento/magento2-phpstorm-plugin#<issue_number>: Issue title
+1. Fixes magento/magento2-phpstorm-plugin#<issue_number>
 
 **Questions or comments**
 <!---

.github/workflows/gradle.yml

@@ -5,11 +5,10 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 2.0.0-develop, 2.1.0-develop ]
+    branches: [ master, 2.0.1-develop, 2.1.0-develop ]
 
 jobs:
   build-linux:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -18,6 +17,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew
@@ -26,7 +33,6 @@ jobs:
         run: ./gradlew test -i --no-daemon
 
   build-windows:
-
     runs-on: windows-latest
 
     steps:
@@ -35,6 +41,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew
@@ -43,7 +57,6 @@ jobs:
         run: ./gradlew test -i --no-daemon
 
   build-macos:
-
     runs-on: macos-latest
 
     steps:
@@ -52,6 +65,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew
@@ -60,7 +81,6 @@ jobs:
         run: ./gradlew test -i --no-daemon
 
   static-tests:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -69,6 +89,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew