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

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

@@ -74,11 +74,11 @@ GOFLAGS ?= $(GOFLAGS:)
export GOBIN ?= $(PWD)/bin export GOBIN ?= $(PWD)/bin
GO=go GO=go
DELVE=dlv DELVE=dlv
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)" LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)" LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)" LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)" LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1) GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2) GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
@@ -147,7 +147,7 @@ all: run ## Alias for 'run'.
include config.mk include config.mk
include build/*.mk include build/*.mk
LDFLAGS += -X "github.com/mattermost/mattermost-server/v5/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"
RUN_IN_BACKGROUND ?= RUN_IN_BACKGROUND ?=
ifeq ($(RUN_SERVER_IN_BACKGROUND),true) ifeq ($(RUN_SERVER_IN_BACKGROUND),true)
@@ -460,20 +460,20 @@ run-server: prepackaged-binaries validate-go-version start-docker ## Starts the
debug-server: start-docker ## Compile and start server using delve. debug-server: start-docker ## Compile and start server using delve.
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\ $(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
-X github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)\ -X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\
-X \"github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)\"\ -X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\
-X github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)\ -X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\
-X github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ -X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-X github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" -X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ. debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ.
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
$(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\ $(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\
-X github.com/mattermost/mattermost-server/v5/model.BuildNumber=$(BUILD_NUMBER)\ -X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\
-X \"github.com/mattermost/mattermost-server/v5/model.BuildDate=$(BUILD_DATE)\"\ -X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\
-X github.com/mattermost/mattermost-server/v5/model.BuildHash=$(BUILD_HASH)\ -X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\
-X github.com/mattermost/mattermost-server/v5/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ -X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-X github.com/mattermost/mattermost-server/v5/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" -X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
run-cli: start-docker ## Runs CLI. run-cli: start-docker ## Runs CLI.
@echo Running mattermost for development @echo Running mattermost for development

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

@@ -9,9 +9,9 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
_ "github.com/mattermost/go-i18n/i18n" _ "github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/web" "github.com/mattermost/mattermost-server/v6/web"
) )
type Routes struct { type Routes struct {

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

@@ -21,20 +21,20 @@ import (
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/app/request" "github.com/mattermost/mattermost-server/v6/app/request"
"github.com/mattermost/mattermost-server/v5/config" "github.com/mattermost/mattermost-server/v6/config"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
"github.com/mattermost/mattermost-server/v5/services/searchengine" "github.com/mattermost/mattermost-server/v6/services/searchengine"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v6/store"
"github.com/mattermost/mattermost-server/v5/store/localcachelayer" "github.com/mattermost/mattermost-server/v6/store/localcachelayer"
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/mattermost/mattermost-server/v6/store/storetest/mocks"
"github.com/mattermost/mattermost-server/v5/testlib" "github.com/mattermost/mattermost-server/v6/testlib"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
"github.com/mattermost/mattermost-server/v5/web" "github.com/mattermost/mattermost-server/v6/web"
"github.com/mattermost/mattermost-server/v5/wsapi" "github.com/mattermost/mattermost-server/v6/wsapi"
) )
type TestHelper struct { type TestHelper struct {

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitBleve() { func (api *API) InitBleve() {

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestBlevePurgeIndexes(t *testing.T) { func TestBlevePurgeIndexes(t *testing.T) {

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

@@ -11,8 +11,8 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitBot() { func (api *API) InitBot() {

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

@@ -15,9 +15,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/mattermost/mattermost-server/v6/utils/fileutils"
"github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/mattermost/mattermost-server/v6/utils/testutils"
) )
func TestCreateBot(t *testing.T) { func TestCreateBot(t *testing.T) {

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

@@ -8,8 +8,8 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitBrand() { func (api *API) InitBrand() {

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

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

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

@@ -10,10 +10,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
func (api *API) InitChannel() { func (api *API) InitChannel() {

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

@@ -6,9 +6,9 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) { func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) {

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

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

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

@@ -6,9 +6,9 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitChannelLocal() { func (api *API) InitChannelLocal() {

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

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

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

@@ -12,8 +12,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitCloud() { func (api *API) InitCloud() {

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitCluster() { func (api *API) InitCluster() {

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

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

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

@@ -8,8 +8,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitCommand() { func (api *API) InitCommand() {

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

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

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitCommandLocal() { func (api *API) InitCommandLocal() {

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

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

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

@@ -8,10 +8,10 @@ import (
"testing" "testing"
"time" "time"
_ "github.com/mattermost/mattermost-server/v5/app/slashcommands" _ "github.com/mattermost/mattermost-server/v6/app/slashcommands"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestEchoCommand(t *testing.T) { func TestEchoCommand(t *testing.T) {

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

@@ -9,8 +9,8 @@ import (
"github.com/avct/uasurfer" "github.com/avct/uasurfer"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitCompliance() { func (api *API) InitCompliance() {

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

@@ -9,11 +9,11 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/config" "github.com/mattermost/mattermost-server/v6/config"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
) )
var writeFilter func(c *Context, structField reflect.StructField) bool var writeFilter func(c *Context, structField reflect.StructField) bool

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

@@ -7,10 +7,10 @@ import (
"net/http" "net/http"
"reflect" "reflect"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/config" "github.com/mattermost/mattermost-server/v6/config"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
) )
func (api *API) InitConfigLocal() { func (api *API) InitConfigLocal() {

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

@@ -15,9 +15,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/config" "github.com/mattermost/mattermost-server/v6/config"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestGetConfig(t *testing.T) { func TestGetConfig(t *testing.T) {

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

@@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/mattermost/mattermost-server/v6/store/storetest/mocks"
) )
const ( const (

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

@@ -7,8 +7,8 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitDataRetention() { func (api *API) InitDataRetention() {

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitElasticsearch() { func (api *API) InitElasticsearch() {

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestElasticsearchTest(t *testing.T) { func TestElasticsearchTest(t *testing.T) {

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

@@ -9,10 +9,10 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/web" "github.com/mattermost/mattermost-server/v6/web"
) )
const ( const (

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

@@ -14,10 +14,10 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"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 TestCreateEmoji(t *testing.T) { func TestCreateEmoji(t *testing.T) {

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

@@ -9,8 +9,8 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitExport() { func (api *API) InitExport() {

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

@@ -11,8 +11,8 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/mattermost/mattermost-server/v6/utils/fileutils"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -15,10 +15,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
) )
const ( const (

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

@@ -22,10 +22,10 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/mattermost/mattermost-server/v6/utils/fileutils"
"github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/mattermost/mattermost-server/v6/utils/testutils"
) )
var testDir = "" var testDir = ""

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

@@ -11,8 +11,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitGroup() { func (api *API) InitGroup() {

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

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

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

@@ -8,7 +8,7 @@ import (
"github.com/mattermost/gziphandler" "github.com/mattermost/gziphandler"
"github.com/mattermost/mattermost-server/v5/web" "github.com/mattermost/mattermost-server/v6/web"
) )
type Context = web.Context type Context = web.Context

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

@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) { func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) {

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

@@ -7,7 +7,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitImage() { func (api *API) InitImage() {

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

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

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

@@ -7,7 +7,7 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitImport() { func (api *API) InitImport() {

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

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

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

@@ -7,7 +7,7 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitAction() { func (api *API) InitAction() {

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

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

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

@@ -9,9 +9,9 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
func (api *API) InitJob() { func (api *API) InitJob() {

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

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

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

@@ -8,8 +8,8 @@ import (
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
type mixedUnlinkedGroup struct { type mixedUnlinkedGroup struct {

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

@@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/einterfaces/mocks" "github.com/mattermost/mattermost-server/v6/einterfaces/mocks"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
) )
var spPrivateKey = `-----BEGIN PRIVATE KEY----- var spPrivateKey = `-----BEGIN PRIVATE KEY-----

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

@@ -11,10 +11,10 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitLicense() { func (api *API) InitLicense() {

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

@@ -8,8 +8,8 @@ import (
"io" "io"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitLicenseLocal() { func (api *API) InitLicenseLocal() {

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

@@ -9,14 +9,14 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/v5/einterfaces/mocks" "github.com/mattermost/mattermost-server/v6/einterfaces/mocks"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
mocks2 "github.com/mattermost/mattermost-server/v5/utils/mocks" mocks2 "github.com/mattermost/mattermost-server/v6/utils/mocks"
"github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/mattermost/mattermost-server/v6/utils/testutils"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestGetOldClientLicense(t *testing.T) { func TestGetOldClientLicense(t *testing.T) {

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

@@ -7,8 +7,8 @@ import (
"flag" "flag"
"testing" "testing"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v5/testlib" "github.com/mattermost/mattermost-server/v6/testlib"
) )
var replicaFlag bool var replicaFlag bool

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitOAuth() { func (api *API) InitOAuth() {

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

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

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

@@ -7,8 +7,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/services/cache" "github.com/mattermost/mattermost-server/v6/services/cache"
) )
const OpenGraphMetadataCacheSize = 10000 const OpenGraphMetadataCacheSize = 10000

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

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

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

@@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitPermissions() { func (api *API) InitPermissions() {

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

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

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

@@ -13,10 +13,10 @@ import (
"net/url" "net/url"
"strconv" "strconv"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v6/store"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

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

@@ -22,10 +22,10 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/plugin" "github.com/mattermost/mattermost-server/v6/plugin"
"github.com/mattermost/mattermost-server/v5/testlib" "github.com/mattermost/mattermost-server/v6/testlib"
"github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/mattermost/mattermost-server/v6/utils/fileutils"
) )
func TestPlugin(t *testing.T) { func TestPlugin(t *testing.T) {

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

@@ -9,10 +9,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
func (api *API) InitPost() { func (api *API) InitPost() {

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

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

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitPreference() { func (api *API) InitPreference() {

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

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

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitReaction() { func (api *API) InitReaction() {

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

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

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

@@ -10,9 +10,9 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/services/remotecluster" "github.com/mattermost/mattermost-server/v6/services/remotecluster"
) )
func (api *API) InitRemoteCluster() { func (api *API) InitRemoteCluster() {

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
var notAllowedPermissions = []string{ var notAllowedPermissions = []string{

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

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

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

@@ -10,8 +10,8 @@ import (
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitSaml() { func (api *API) InitSaml() {

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

@@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/einterfaces/mocks" "github.com/mattermost/mattermost-server/v6/einterfaces/mocks"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestGetSamlMetadata(t *testing.T) { func TestGetSamlMetadata(t *testing.T) {

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitScheme() { func (api *API) InitScheme() {

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

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

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

@@ -7,7 +7,7 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitSharedChannels() { func (api *API) InitSharedChannels() {

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

@@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
var ( var (

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitStatus() { func (api *API) InitStatus() {

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

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

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

@@ -17,11 +17,11 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/services/cache" "github.com/mattermost/mattermost-server/v6/services/cache"
"github.com/mattermost/mattermost-server/v5/services/upgrader" "github.com/mattermost/mattermost-server/v6/services/upgrader"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
const ( const (

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

@@ -7,8 +7,8 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitSystemLocal() { func (api *API) InitSystemLocal() {

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

@@ -17,8 +17,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
func TestGetPing(t *testing.T) { func TestGetPing(t *testing.T) {

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

@@ -15,8 +15,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
const ( const (

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

@@ -10,10 +10,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v5/app/email" "github.com/mattermost/mattermost-server/v6/app/email"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v6/store"
) )
func (api *API) InitTeamLocal() { func (api *API) InitTeamLocal() {

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

@@ -15,11 +15,11 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/i18n" "github.com/mattermost/mattermost-server/v6/shared/i18n"
"github.com/mattermost/mattermost-server/v5/shared/mail" "github.com/mattermost/mattermost-server/v6/shared/mail"
"github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/mattermost/mattermost-server/v6/utils/testutils"
) )
func TestCreateTeam(t *testing.T) { func TestCreateTeam(t *testing.T) {

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

@@ -6,9 +6,9 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitTermsOfService() { func (api *API) InitTermsOfService() {

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

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

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

@@ -9,8 +9,8 @@ import (
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitUpload() { func (api *API) InitUpload() {

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

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

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

@@ -13,12 +13,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v6/store"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
) )
func (api *API) InitUser() { func (api *API) InitUser() {

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

@@ -7,9 +7,9 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v6/store"
) )
func (api *API) InitUserLocal() { func (api *API) InitUserLocal() {

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

@@ -17,13 +17,13 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/einterfaces/mocks" "github.com/mattermost/mattermost-server/v6/einterfaces/mocks"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mail" "github.com/mattermost/mattermost-server/v6/shared/mail"
"github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/mattermost/mattermost-server/v6/utils/testutils"
_ "github.com/mattermost/mattermost-server/v5/model/gitlab" _ "github.com/mattermost/mattermost-server/v6/model/gitlab"
) )
func TestCreateUser(t *testing.T) { func TestCreateUser(t *testing.T) {

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

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

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitWebhook() { func (api *API) InitWebhook() {

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v6/audit"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func (api *API) InitWebhookLocal() { func (api *API) InitWebhookLocal() {

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

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

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

@@ -8,9 +8,9 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v6/app"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
) )
const ( const (

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

@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
// TestWebSocket is intentionally made to skip -race mode // TestWebSocket is intentionally made to skip -race mode

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

@@ -13,7 +13,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
) )
func TestWebSocketTrailingSlash(t *testing.T) { func TestWebSocketTrailingSlash(t *testing.T) {

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

@@ -13,11 +13,11 @@ import (
"runtime/debug" "runtime/debug"
"time" "time"
"github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v5/shared/i18n" "github.com/mattermost/mattermost-server/v6/shared/i18n"
"github.com/mattermost/mattermost-server/v5/shared/mail" "github.com/mattermost/mattermost-server/v6/shared/mail"
"github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/mlog"
"github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v6/utils"
) )
func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) { func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) {

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше