[MM-19948] Set version on module file and internal paths (#13186)

* [MM-19948] Set version on module file and internal paths

* Fixes after merge

* Fix i18n checker error
Этот коммит содержится в:
Miguel de la Cruz
2019-11-28 14:39:38 +01:00
коммит произвёл GitHub
родитель 14bcd1f0a1
Коммит 2259b7f2a8
635 изменённых файлов: 1309 добавлений и 1307 удалений

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

@@ -14,7 +14,7 @@ import (
"path"
"strings"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
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/model"
"github.com/mattermost/mattermost-server/v5/model"
)
func TestRenderWebError(t *testing.T) {

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

@@ -4,7 +4,7 @@
package utils
import (
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/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/model"
"github.com/mattermost/mattermost-server/v5/model"
)
type RoleState struct {

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

@@ -6,7 +6,7 @@ package fileutils_test
import (
"testing"
"github.com/mattermost/mattermost-server/testlib"
"github.com/mattermost/mattermost-server/v5/testlib"
)
var mainHelper *testlib.MainHelper

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

@@ -15,8 +15,8 @@ import (
"github.com/fsnotify/fsnotify"
"github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/utils/fileutils"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
)
type HTMLTemplateWatcher struct {

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

@@ -19,7 +19,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
var htmlTestTranslationBundle *bundle.Bundle

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

@@ -11,9 +11,9 @@ import (
"strings"
"github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils/fileutils"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
)
var T i18n.TranslateFunc

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

@@ -7,7 +7,7 @@ import (
"bytes"
"testing"
"github.com/mattermost/mattermost-server/utils/testutils"
"github.com/mattermost/mattermost-server/v5/utils/testutils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

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

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

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

@@ -6,7 +6,7 @@ package jsonutils_test
import (
"testing"
"github.com/mattermost/mattermost-server/testlib"
"github.com/mattermost/mattermost-server/v5/testlib"
)
var mainHelper *testlib.MainHelper

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

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

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

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

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

@@ -6,7 +6,7 @@ package utils_test
import (
"testing"
"github.com/mattermost/mattermost-server/testlib"
"github.com/mattermost/mattermost-server/v5/testlib"
)
var mainHelper *testlib.MainHelper

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

@@ -6,7 +6,7 @@ package markdown_test
import (
"testing"
"github.com/mattermost/mattermost-server/testlib"
"github.com/mattermost/mattermost-server/v5/testlib"
)
var mainHelper *testlib.MainHelper

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

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

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

@@ -7,7 +7,7 @@ import (
"net/http"
"strings"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
func IsPasswordValidWithSettings(password string, settings *model.PasswordSettings) *model.AppError {

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

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

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

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

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

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

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

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

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

@@ -9,7 +9,7 @@ import (
"os"
"path/filepath"
"github.com/mattermost/mattermost-server/utils/fileutils"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
)
func ReadTestFile(name string) ([]byte, error) {