Merge branch 'master' into feat/dynatrace-plugin-synthetics

Signed-off-by: Isaiah Thiessen <isaiah.thiessen@telus.com>

microsite/data/plugins/tekton-pipelines.yaml

@@ -5,5 +5,5 @@ authorUrl: https://github.com/jquad-group
 category: CI
 description: View the status of the Tekton PipelineRun resources.
 documentation: https://github.com/jquad-group/backstage-jquad#readme
-iconUrl: https://github.com/jquad-group/backstage-jquad/blob/main/img/tekton-horizontal-color.png
+iconUrl: https://raw.githubusercontent.com/jquad-group/backstage-jquad/main/img/tekton-horizontal-color.png
 npmPackageName: '@jquad-group/plugin-tekton-pipelines'

microsite/sidebars.json

@@ -150,10 +150,7 @@
       {
         "type": "subcategory",
         "label": "Bitbucket",
-        "ids": [
-          "integrations/bitbucket/locations",
-          "integrations/bitbucket/discovery"
-        ]
+        "ids": ["integrations/bitbucket/discovery"]
       },
       {
         "type": "subcategory",
@@ -163,6 +160,14 @@
           "integrations/bitbucketCloud/discovery"
         ]
       },
+      {
+        "type": "subcategory",
+        "label": "Bitbucket Server",
+        "ids": [
+          "integrations/bitbucketServer/locations",
+          "integrations/bitbucketServer/discovery"
+        ]
+      },
       {
         "type": "subcategory",
         "label": "Datadog",