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

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

@@ -7,10 +7,10 @@ import (
"net/http" "net/http"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/configservice" "github.com/mattermost/mattermost-server/v5/services/configservice"
"github.com/mattermost/mattermost-server/web" "github.com/mattermost/mattermost-server/v5/web"
_ "github.com/mattermost/go-i18n/i18n" _ "github.com/mattermost/go-i18n/i18n"
) )

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

@@ -13,14 +13,14 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/config" "github.com/mattermost/mattermost-server/v5/config"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/web" "github.com/mattermost/mattermost-server/v5/web"
"github.com/mattermost/mattermost-server/wsapi" "github.com/mattermost/mattermost-server/v5/wsapi"
s3 "github.com/minio/minio-go/v6" s3 "github.com/minio/minio-go/v6"
"github.com/minio/minio-go/v6/pkg/credentials" "github.com/minio/minio-go/v6/pkg/credentials"

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

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

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

@@ -12,9 +12,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils/fileutils" "github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/utils/testutils" "github.com/mattermost/mattermost-server/v5/utils/testutils"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

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

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

@@ -8,9 +8,9 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/v5/store"
) )
func (api *API) InitChannel() { func (api *API) InitChannel() {

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

@@ -12,8 +12,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -6,7 +6,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestCreateCommand(t *testing.T) { func TestCreateCommand(t *testing.T) {

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

@@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

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

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

@@ -6,7 +6,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

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

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

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

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

@@ -12,9 +12,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/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
func TestCreateEmoji(t *testing.T) { func TestCreateEmoji(t *testing.T) {

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

@@ -16,9 +16,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
const ( const (

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

@@ -19,10 +19,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils/fileutils" "github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/mattermost/mattermost-server/utils/testutils" "github.com/mattermost/mattermost-server/v5/utils/testutils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -10,7 +10,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (api *API) InitGroup() { func (api *API) InitGroup() {

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

@@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

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

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (api *API) InitAction() { func (api *API) InitAction() {

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

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

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

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

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

@@ -7,7 +7,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -8,7 +8,7 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
type mixedUnlinkedGroup struct { type mixedUnlinkedGroup struct {

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

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

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

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

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

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

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

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

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

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

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

@@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -6,8 +6,8 @@ package api4
import ( import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000 const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000

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

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

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

@@ -14,8 +14,8 @@ import (
"net/url" "net/url"
"time" "time"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
const ( const (

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

@@ -17,9 +17,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/testlib" "github.com/mattermost/mattermost-server/v5/testlib"
"github.com/mattermost/mattermost-server/utils/fileutils" "github.com/mattermost/mattermost-server/v5/utils/fileutils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -19,10 +19,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/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/utils/testutils" "github.com/mattermost/mattermost-server/v5/utils/testutils"
) )
func TestCreatePost(t *testing.T) { func TestCreatePost(t *testing.T) {

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

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

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

@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (api *API) InitReaction() { func (api *API) InitReaction() {

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

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

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

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

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestGetRole(t *testing.T) { func TestGetRole(t *testing.T) {

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

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

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

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

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestCreateScheme(t *testing.T) { func TestCreateScheme(t *testing.T) {

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

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

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

@@ -3,7 +3,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

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

@@ -11,10 +11,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/filesstore" "github.com/mattermost/mattermost-server/v5/services/filesstore"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
const ( const (

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

@@ -9,8 +9,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -13,11 +13,11 @@ import (
"encoding/base64" "encoding/base64"
"github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/mailservice" "github.com/mattermost/mattermost-server/v5/services/mailservice"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/utils/testutils" "github.com/mattermost/mattermost-server/v5/utils/testutils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -3,7 +3,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -12,10 +12,10 @@ import (
"time" "time"
"github.com/dgryski/dgoogauth" "github.com/dgryski/dgoogauth"
"github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/mailservice" "github.com/mattermost/mattermost-server/v5/services/mailservice"
"github.com/mattermost/mattermost-server/utils/testutils" "github.com/mattermost/mattermost-server/v5/utils/testutils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -3,7 +3,7 @@ package api4
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

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

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestCreateIncomingWebhook(t *testing.T) { func TestCreateIncomingWebhook(t *testing.T) {

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

@@ -7,8 +7,8 @@ import (
"net/http" "net/http"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (api *API) InitWebSocket() { func (api *API) InitWebSocket() {

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestWebSocket(t *testing.T) { func TestWebSocket(t *testing.T) {

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

@@ -13,10 +13,10 @@ import (
"net/http" "net/http"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/mailservice" "github.com/mattermost/mattermost-server/v5/services/mailservice"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
func (a *App) GetLogs(page, perPage int) ([]string, *model.AppError) { func (a *App) GetLogs(page, perPage int) ([]string, *model.AppError) {

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

@@ -4,9 +4,9 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/v5/store"
) )
const ( const (

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

@@ -9,14 +9,14 @@ import (
"strconv" "strconv"
goi18n "github.com/mattermost/go-i18n/i18n" goi18n "github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/einterfaces" "github.com/mattermost/mattermost-server/v5/einterfaces"
"github.com/mattermost/mattermost-server/jobs" "github.com/mattermost/mattermost-server/v5/jobs"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/httpservice" "github.com/mattermost/mattermost-server/v5/services/httpservice"
"github.com/mattermost/mattermost-server/services/imageproxy" "github.com/mattermost/mattermost-server/v5/services/imageproxy"
"github.com/mattermost/mattermost-server/services/timezones" "github.com/mattermost/mattermost-server/v5/services/timezones"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type App struct { type App struct {

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

@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
/* Temporarily comment out until MM-11108 /* Temporarily comment out until MM-11108

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

@@ -4,7 +4,7 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (a *App) GetAudits(userId string, limit int) (model.Audits, *model.AppError) { func (a *App) GetAudits(userId string, limit int) (model.Audits, *model.AppError) {

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

@@ -7,9 +7,9 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/services/mfa" "github.com/mattermost/mattermost-server/v5/services/mfa"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type TokenLocation int type TokenLocation int

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

@@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -7,8 +7,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (a *App) MakePermissionError(permission *model.Permission) *model.AppError { func (a *App) MakePermissionError(permission *model.Permission) *model.AppError {

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

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

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

@@ -4,8 +4,8 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type AutoChannelCreator struct { type AutoChannelCreator struct {

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

@@ -4,8 +4,8 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
const ( const (

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

@@ -7,8 +7,8 @@ import (
"math/rand" "math/rand"
"time" "time"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type TestEnvironment struct { type TestEnvironment struct {

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

@@ -9,9 +9,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
"github.com/mattermost/mattermost-server/utils/fileutils" "github.com/mattermost/mattermost-server/v5/utils/fileutils"
) )
type AutoPostCreator struct { type AutoPostCreator struct {

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

@@ -4,8 +4,8 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (a *App) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User) (bool, *model.AppError) { func (a *App) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User) (bool, *model.AppError) {

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

@@ -6,7 +6,7 @@ package app
import ( import (
"testing" "testing"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@@ -4,8 +4,8 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type TeamEnvironment struct { type TeamEnvironment struct {

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

@@ -4,9 +4,9 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type AutoUserCreator struct { type AutoUserCreator struct {

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

@@ -9,10 +9,10 @@ import (
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
// CreateBot creates the given bot and corresponding user. // CreateBot creates the given bot and corresponding user.

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

@@ -14,8 +14,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/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/utils/fileutils" "github.com/mattermost/mattermost-server/v5/utils/fileutils"
) )
func TestCreateBot(t *testing.T) { func TestCreateBot(t *testing.T) {

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

@@ -13,7 +13,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
const ( const (

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

@@ -9,11 +9,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/plugin" "github.com/mattermost/mattermost-server/v5/plugin"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
// CreateDefaultChannels creates channels in the given team for each channel returned by (*App).DefaultChannelNames. // CreateDefaultChannels creates channels in the given team for each channel returned by (*App).DefaultChannelNames.

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

@@ -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/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestPermanentDeleteChannel(t *testing.T) { func TestPermanentDeleteChannel(t *testing.T) {

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

@@ -4,7 +4,7 @@
package app package app
import ( import (
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
// Registers a given function to be called when the cluster leader may have changed. Returns a unique ID for the // Registers a given function to be called when the cluster leader may have changed. Returns a unique ID for the

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

@@ -6,8 +6,8 @@ package app
import ( import (
"time" "time"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
const ( const (

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

@@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func TestClusterDiscoveryService(t *testing.T) { func TestClusterDiscoveryService(t *testing.T) {

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

@@ -6,7 +6,7 @@ package app
import ( import (
"strings" "strings"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
func (a *App) RegisterAllClusterMessageHandlers() { func (a *App) RegisterAllClusterMessageHandlers() {

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

@@ -12,10 +12,10 @@ import (
"strings" "strings"
goi18n "github.com/mattermost/go-i18n/i18n" goi18n "github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/v5/utils"
) )
type CommandProvider interface { type CommandProvider interface {

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

@@ -5,7 +5,7 @@ package app
import ( import (
goi18n "github.com/mattermost/go-i18n/i18n" goi18n "github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
type AwayProvider struct { type AwayProvider struct {

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

@@ -6,7 +6,7 @@ package app
import ( import (
goi18n "github.com/mattermost/go-i18n/i18n" goi18n "github.com/mattermost/go-i18n/i18n"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/v5/model"
) )
type HeaderProvider struct { type HeaderProvider struct {

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

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

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