MM-36271: Bump major version to 6.0 (#17973)

https://mattermost.atlassian.net/browse/MM-36271

```release-note
We bump the major version to 6.0
```
Этот коммит содержится в:
Agniva De Sarker
2021-07-22 12:21:47 +05:30
коммит произвёл GitHub
родитель 33edd645c7
Коммит c4b4e1bc38
899 изменённых файлов: 2383 добавлений и 2384 удалений

Просмотреть файл

@@ -14,8 +14,8 @@ import (
"path"
"strings"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/i18n"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/i18n"
)
func CheckOrigin(r *http.Request, allowedOrigins string) bool {

Просмотреть файл

@@ -19,7 +19,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
func TestRenderWebError(t *testing.T) {

Просмотреть файл

@@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/v6/utils/fileutils"
)
func TestSanitizePath(t *testing.T) {

Просмотреть файл

@@ -4,7 +4,7 @@
package utils
import (
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Config, isLicensed bool) map[string]*model.Role {

Просмотреть файл

@@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
type RoleState struct {

Просмотреть файл

@@ -8,8 +8,8 @@ import (
"os"
"path/filepath"
"github.com/mattermost/mattermost-server/v5/shared/i18n"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/v6/shared/i18n"
"github.com/mattermost/mattermost-server/v6/utils/fileutils"
)
// this functions loads translations from filesystem if they are not

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/utils/testutils"
"github.com/mattermost/mattermost-server/v6/utils/testutils"
)
func TestCountFrames(t *testing.T) {

Просмотреть файл

@@ -11,7 +11,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/v5/utils/jsonutils"
"github.com/mattermost/mattermost-server/v6/utils/jsonutils"
)
func TestHumanizeJsonError(t *testing.T) {

Просмотреть файл

@@ -17,9 +17,9 @@ import (
"strconv"
"strings"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v6/utils/fileutils"
)
var publicKey []byte = []byte(`-----BEGIN PUBLIC KEY-----

Просмотреть файл

@@ -7,9 +7,9 @@ import (
"path/filepath"
"strings"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v6/utils/fileutils"
)
const (

Просмотреть файл

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/v6/utils"
)
// Test merging maps alone. This isolates the complexity of merging maps from merging maps recursively in

Просмотреть файл

@@ -5,7 +5,7 @@
package mocks
import (
model "github.com/mattermost/mattermost-server/v5/model"
model "github.com/mattermost/mattermost-server/v6/model"
mock "github.com/stretchr/testify/mock"
)

Просмотреть файл

@@ -17,9 +17,9 @@ import (
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v6/utils/fileutils"
)
// getSubpathScript renders the inline script that defines window.publicPath to change how webpack loads assets.

Просмотреть файл

@@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/utils"
)
func TestUpdateAssetsSubpathFromConfig(t *testing.T) {

Просмотреть файл

@@ -6,7 +6,7 @@ package testutils
import (
"crypto/ecdsa"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
type StaticConfigService struct {

Просмотреть файл

@@ -14,9 +14,9 @@ import (
"strconv"
"time"
"github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/v6/utils"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/v6/utils/fileutils"
)
func ReadTestFile(name string) ([]byte, error) {

Просмотреть файл

@@ -12,7 +12,7 @@ import (
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
func StringInSlice(a string, slice []string) bool {