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 удалений

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

@@ -10,9 +10,9 @@ import (
"fmt"
"sync"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/services/remotecluster"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
)
// postsToAttachments returns the file attachments for a slice of posts that need to be synchronized.

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

@@ -9,10 +9,10 @@ import (
"fmt"
"strings"
"github.com/mattermost/mattermost-server/v5/app/request"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v6/app/request"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/services/remotecluster"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
)
// channelInviteMsg represents an invitation for a remote cluster to start sharing a channel.

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

@@ -13,10 +13,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v6/store/storetest/mocks"
)
type mockLogger struct {

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

@@ -5,12 +5,12 @@
package sharedchannel
import (
filestore "github.com/mattermost/mattermost-server/v5/shared/filestore"
filestore "github.com/mattermost/mattermost-server/v6/shared/filestore"
mock "github.com/stretchr/testify/mock"
model "github.com/mattermost/mattermost-server/v5/model"
model "github.com/mattermost/mattermost-server/v6/model"
request "github.com/mattermost/mattermost-server/v5/app/request"
request "github.com/mattermost/mattermost-server/v6/app/request"
)
// MockAppIface is an autogenerated mock type for the AppIface type

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

@@ -5,14 +5,14 @@
package sharedchannel
import (
mlog "github.com/mattermost/mattermost-server/v5/shared/mlog"
mlog "github.com/mattermost/mattermost-server/v6/shared/mlog"
mock "github.com/stretchr/testify/mock"
model "github.com/mattermost/mattermost-server/v5/model"
model "github.com/mattermost/mattermost-server/v6/model"
remotecluster "github.com/mattermost/mattermost-server/v5/services/remotecluster"
remotecluster "github.com/mattermost/mattermost-server/v6/services/remotecluster"
store "github.com/mattermost/mattermost-server/v5/store"
store "github.com/mattermost/mattermost-server/v6/store"
)
// MockServerIface is an autogenerated mock type for the ServerIface type

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

@@ -6,7 +6,7 @@ package sharedchannel
import (
"encoding/json"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
// syncMsg represents a change in content (post add/edit/delete, reaction add/remove, users).

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

@@ -9,9 +9,9 @@ import (
"regexp"
"strings"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/i18n"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/i18n"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
)
var (

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

@@ -10,10 +10,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock"
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks"
"github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
"github.com/mattermost/mattermost-server/v6/store/storetest/mocks"
"github.com/mattermost/mattermost-server/v6/utils"
)
func TestProcessPermalinkToRemote(t *testing.T) {

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

@@ -10,12 +10,12 @@ import (
"sync"
"time"
"github.com/mattermost/mattermost-server/v5/app/request"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/filestore"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/v6/app/request"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/services/remotecluster"
"github.com/mattermost/mattermost-server/v6/shared/filestore"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v6/store"
)
const (

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

@@ -11,10 +11,10 @@ import (
"strconv"
"strings"
"github.com/mattermost/mattermost-server/v5/app/request"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v6/app/request"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/services/remotecluster"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
)
func (scs *Service) onReceiveSyncMessage(msg model.RemoteClusterMsg, rc *model.RemoteCluster, response *remotecluster.Response) error {

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

@@ -8,10 +8,10 @@ import (
"fmt"
"time"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/i18n"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/services/remotecluster"
"github.com/mattermost/mattermost-server/v6/shared/i18n"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
)
type syncTask struct {

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

@@ -11,9 +11,9 @@ import (
"github.com/wiggin77/merror"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/services/remotecluster"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
)
type sendSyncMsgResultFunc func(syncResp SyncResponse, err error)

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

@@ -7,7 +7,7 @@ import (
"fmt"
"strings"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v6/model"
)
// fixMention replaces any mentions in a post for the user with the user's real username.