Merge remote-tracking branch 'origin/main' into login-improvement

mattermost · Nov 10, 2024 · 4460a2a · 4460a2a
2 parents 26ddb72 + 83189af
commit 4460a2a
Show file tree

Hide file tree

Showing 66 changed files with 2,817 additions and 383 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.0.6
+3.2.0
diff --git a/.solidarity b/.solidarity
@@ -32,7 +32,7 @@
       {
         "rule": "cli",
         "binary": "ruby",
-        "semver": ">=3.0.0",
+        "semver": ">=3.2.0",
         "error": "visit rvm install https://rvm.io/rvm/install",
         "platform": "darwin"
       },

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -111,7 +111,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 569
+        versionCode 572
         versionName "2.22.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/android/app/src/main/res/xml/file_viewer_provider_paths.xml b/android/app/src/main/res/xml/file_viewer_provider_paths.xml
@@ -4,5 +4,4 @@
     <external-files-path name="external_files" path="." />
     <external-path name="external" path="." />
     <cache-path name="cache" path="." />
-    <root-path name="root" path="." />
 </paths>
diff --git a/android/app/src/main/res/xml/provider_paths.xml b/android/app/src/main/res/xml/provider_paths.xml
diff --git a/app/actions/local/category.test.ts b/app/actions/local/category.test.ts
@@ -1,9 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {DMS_CATEGORY} from '@app/constants/categories';
-import {setCurrentUserId} from '@app/queries/servers/system';
+import {DMS_CATEGORY} from '@constants/categories';
 import DatabaseManager from '@database/manager';
+import {setCurrentUserId} from '@queries/servers/system';
 
 import {
     deleteCategory,

diff --git a/app/actions/local/channel.test.ts b/app/actions/local/channel.test.ts
@@ -29,7 +29,7 @@ import {
     updateDmGmDisplayName,
 } from './channel';
 
-import type {ChannelModel, MyChannelModel, SystemModel} from '@app/database/models/server';
+import type {ChannelModel, MyChannelModel, SystemModel} from '@database/models/server';
 import type ServerDataOperator from '@database/operator/server_data_operator';
 import type {Database} from '@nozbe/watermelondb';
 

diff --git a/app/actions/local/post.test.ts b/app/actions/local/post.test.ts
@@ -1,11 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ActionType, Post} from '@app/constants';
-import {COMBINED_USER_ACTIVITY} from '@app/utils/post_list';
+import {ActionType, Post} from '@constants';
 import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import TestHelper from '@test/test_helper';
+import {COMBINED_USER_ACTIVITY} from '@utils/post_list';
 
 import {
     sendAddToChannelEphemeralPost,

diff --git a/app/actions/local/reactions.test.ts b/app/actions/local/reactions.test.ts
@@ -7,7 +7,7 @@ import * as logUtils from '@utils/log';
 
 import {addRecentReaction} from './reactions';
 
-import type ServerDataOperator from '@app/database/operator/server_data_operator';
+import type ServerDataOperator from '@database/operator/server_data_operator';
 
 jest.mock('@database/manager');
 jest.mock('@queries/servers/system');

diff --git a/app/actions/local/systems.test.ts b/app/actions/local/systems.test.ts
@@ -3,8 +3,8 @@
 
 import Database from '@nozbe/watermelondb/Database';
 
-import {ActionType} from '@app/constants';
-import {SYSTEM_IDENTIFIERS} from '@app/constants/database';
+import {ActionType} from '@constants';
+import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import TestHelper from '@test/test_helper';
 

diff --git a/app/actions/local/team.test.ts b/app/actions/local/team.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-import ServerDataOperator from '@app/database/operator/server_data_operator';
 import DatabaseManager from '@database/manager';
+import ServerDataOperator from '@database/operator/server_data_operator';
 import {getMyTeamById, getTeamById, getTeamSearchHistoryById, prepareDeleteTeam, removeTeamFromTeamHistory} from '@queries/servers/team';
 import {logError} from '@utils/log';
 

diff --git a/app/actions/local/thread.test.ts b/app/actions/local/thread.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ActionType} from '@app/constants';
+import {ActionType} from '@constants';
 import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import Preferences from '@constants/preferences';
 import DatabaseManager from '@database/manager';

diff --git a/app/actions/local/user.test.ts b/app/actions/local/user.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {SYSTEM_IDENTIFIERS} from '@app/constants/database';
+import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 
 import {