* Migration completed

* Order in translations file

* Fix: lints

* Trigger CI

* Fix message key

* Change mlog.Error for mlog.Warn

* Fix imports

* Adding translations needed for EE

* Trigger CI

* Fix merge with master

Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Rodrigo Villablanca
2020-09-24 02:16:36 -03:00
коммит произвёл GitHub
родитель cd7d68effb
Коммит 8118cac350
20 изменённых файлов: 685 добавлений и 450 удалений

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

@@ -1989,8 +1989,8 @@ func TestPermanentDeleteAllUsers(t *testing.T) {
require.Nil(t, err)
require.Greater(t, len(users), 0)
postCount, err := th.App.Srv().Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, err)
postCount, nErr := th.App.Srv().Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, nErr)
require.Greater(t, postCount, int64(0))
// Delete all users and their posts
@@ -2002,8 +2002,8 @@ func TestPermanentDeleteAllUsers(t *testing.T) {
require.Nil(t, err)
require.Len(t, users, 0)
postCount, err = th.App.Srv().Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, err)
postCount, nErr = th.App.Srv().Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, nErr)
require.Equal(t, postCount, int64(0))
// Check that the channel and team created by the user were not deleted