Merge remote-tracking branch 'upstream/master' into collabora

2 jobs for collabora in 11 minutes and 57 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Test
failed lint #103927
allowed to fail

00:08:27

failed test-quick #103928

00:11:56

 
Name Stage Failure
failed
test-quick Test
ok  	github.com/mattermost/mattermost-server/v6/utils/jsonutils	0.008s
? github.com/mattermost/mattermost-server/v6/utils/mocks [no test files]
? github.com/mattermost/mattermost-server/v6/utils/testutils [no test files]
ok github.com/mattermost/mattermost-server/v6/web 0.703s
? github.com/mattermost/mattermost-server/v6/wsapi [no test files]
FAIL
make: *** [Makefile:407: test-server-quick] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 2
failed
lint Test
store/storetest/team_store.go:631:5: unusedwrite: unused write to field Email (govet)
o2.Email = MakeEmail()
^
store/storetest/team_store.go:632:5: unusedwrite: unused write to field Type (govet)
o2.Type = model.TeamOpen
^
make: *** [Makefile:240: golangci-lint] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1