mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
revert back to module name v6; move model and plugin to repo root
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
module github.com/mattermost/mattermost-server/server/v7
|
||||
module github.com/mattermost/mattermost-server/v6
|
||||
|
||||
go 1.19
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/mattermost/mattermost-server/server/v7/platform/shared/mlog"
|
||||
"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
|
||||
)
|
||||
|
||||
type BundleInfo struct {
|
||||
@@ -26,7 +26,7 @@ func TestClient4TrimTrailingSlash(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// https://github.com/mattermost/mattermost-server/server/v7/channels/issues/8205
|
||||
// https://github.com/mattermost/mattermost-server/v6/server/channels/issues/8205
|
||||
func TestClient4CreatePost(t *testing.T) {
|
||||
post := &Post{
|
||||
Props: map[string]any{
|
||||
@@ -273,7 +273,7 @@ type SubscriptionChange struct {
|
||||
// TODO remove BoardsLimits.
|
||||
// It is not used for real.
|
||||
// Focalboard has some lingering code using this struct
|
||||
// https://github.com/mattermost/mattermost-server/server/v7/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
|
||||
// https://github.com/mattermost/mattermost-server/v6/server/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
|
||||
// we should remove this struct once that code is removed.
|
||||
type BoardsLimits struct {
|
||||
Cards *int `json:"cards"`
|
||||
@@ -296,7 +296,7 @@ type ProductLimits struct {
|
||||
// TODO remove Boards property.
|
||||
// It is not used for real.
|
||||
// Focalboard has some lingering code using this property
|
||||
// https://github.com/mattermost/mattermost-server/server/v7/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
|
||||
// https://github.com/mattermost/mattermost-server/v6/server/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86
|
||||
// we should remove this property once that code is removed.
|
||||
Boards *BoardsLimits `json:"boards,omitempty"`
|
||||
Files *FilesLimits `json:"files,omitempty"`
|
||||
@@ -4,7 +4,7 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/mattermost/mattermost-server/server/v7/platform/shared/i18n"
|
||||
"github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n"
|
||||
)
|
||||
|
||||
type CommandArgs struct {
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"github.com/mattermost/mattermost-server/server/v7/channels/utils/jsonutils"
|
||||
"github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -20,8 +20,8 @@ import (
|
||||
|
||||
"github.com/mattermost/ldap"
|
||||
|
||||
"github.com/mattermost/mattermost-server/server/v7/platform/shared/filestore"
|
||||
"github.com/mattermost/mattermost-server/server/v7/platform/shared/mlog"
|
||||
"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
|
||||
"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/mattermost/mattermost-server/server/v7/channels/utils/imgutils"
|
||||
"github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils"
|
||||
)
|
||||
|
||||
const (
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user