Merge branch 'master' into tls-config-location

.drone.star

@@ -700,18 +700,7 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                 "image": "redis:6-alpine",
                 "pull": "always",
             },
-            {
-                "name": "selenium",
-                "image": "selenium/standalone-chrome-debug:3.141.59-20200326",
-                "pull": "always",
-                "volumes": [
-                    {
-                        "name": "uploads",
-                        "path": "/uploads",
-                    },
-                ],
-            },
-        ],
+        ] + selenium(),
         "volumes": [stepVolumeOC10Tests] +
                    [{
                        "name": "uploads",

.github/stale.yml

@@ -7,6 +7,7 @@ daysUntilClose: 10
 exemptLabels:
   - "Type:Bug"
   - "Type:Technical-Debt"
+  - "Category:Research"
 # Label to use when marking an issue as stale
 staleLabel: "Status:Stale"
 # Comment to post when marking an issue as stale. Set to `false` to disable