Merge current v2.5 into master

2021-09-23 15:30:01 +02:00
parent 07a3c37a23 61ceb7a32c
commit 380514941c
35 changed files with 773 additions and 161 deletions
--- a/pkg/api/dashboard/dashboard_test.go
+++ b/pkg/api/dashboard/dashboard_test.go
@@ -68,7 +68,7 @@ func Test_ContentSecurityPolicy(t *testing.T) {
 			desc: "OK",
 			handler: Handler{
 				assets: fstest.MapFS{"foobar.html": &fstest.MapFile{
-					Mode:    0755,
+					Mode:    0o755,
 					ModTime: time.Now(),
 				}},
 			},