mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Merge branch 'master' into MM-50966-in-product-expansion

Просмотр исходного кода
Этот коммит содержится в:
Conor Macpherson
2023-04-18 12:05:00 -04:00
родитель 2f8e9f16e3 067e36c23c
Коммит 3a76a324f6
1605 изменённых файлов: 4690 добавлений и 4167 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
server/platform/services/telemetry/mocks/ServerIface.go
Просмотреть файл

@@ -7,14 +7,14 @@ package mocks
import (
context "context"
httpservice "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
mock "github.com/stretchr/testify/mock"
model "github.com/mattermost/mattermost-server/v6/model"
model "github.com/mattermost/mattermost-server/server/v8/model"
plugin "github.com/mattermost/mattermost-server/v6/plugin"
plugin "github.com/mattermost/mattermost-server/server/v8/plugin"
product "github.com/mattermost/mattermost-server/v6/server/channels/product"
product "github.com/mattermost/mattermost-server/server/v8/channels/product"
)
// ServerIface is an autogenerated mock type for the ServerIface type

18
server/platform/services/telemetry/telemetry.go
Просмотреть файл

@@ -14,15 +14,15 @@ import (
rudder "github.com/rudderlabs/analytics-go"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/plugin"
"github.com/mattermost/mattermost-server/v6/server/channels/product"
"github.com/mattermost/mattermost-server/v6/server/channels/store"
"github.com/mattermost/mattermost-server/v6/server/channels/utils"
"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
"github.com/mattermost/mattermost-server/v6/server/platform/services/marketplace"
"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
"github.com/mattermost/mattermost-server/server/v8/channels/product"
"github.com/mattermost/mattermost-server/server/v8/channels/store"
"github.com/mattermost/mattermost-server/server/v8/channels/utils"
"github.com/mattermost/mattermost-server/server/v8/model"
"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
"github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace"
"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
"github.com/mattermost/mattermost-server/server/v8/plugin"
)
const (

20
server/platform/services/telemetry/telemetry_test.go
Просмотреть файл

@@ -21,16 +21,16 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/plugin"
"github.com/mattermost/mattermost-server/v6/plugin/plugintest"
"github.com/mattermost/mattermost-server/v6/server/channels/product"
storeMocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks"
"github.com/mattermost/mattermost-server/v6/server/config"
"github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice"
"github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine"
"github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry/mocks"
"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
"github.com/mattermost/mattermost-server/server/v8/channels/product"
storeMocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
"github.com/mattermost/mattermost-server/server/v8/config"
"github.com/mattermost/mattermost-server/server/v8/model"
"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
"github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine"
"github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry/mocks"
"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
"github.com/mattermost/mattermost-server/server/v8/plugin"
"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest"
)
type FakeConfigService struct {