Skip to content

Commit 406d242

Browse files
Merge branch 'develop' into feat/openapi-subscriptions-getOne
2 parents ee8cb7e + c4b3153 commit 406d242

434 files changed

Lines changed: 8345 additions & 11764 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/beige-planets-suffer.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
"@rocket.chat/ui-client": patch
4+
---
5+
6+
Fixes a GUI crash happening in the admin user page when attempting to display an invalid custom field

.changeset/late-papayas-swim.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
---
4+
5+
Adds deprecation warning on `removeCannedResponse`;

.changeset/many-moons-wonder.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
---
4+
5+
Adds deprecation warning on legacy method: `livechat:removeUnit`

.changeset/spicy-zebras-deliver.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/meteor': minor
3+
---
4+
5+
Adds a warning modal in order to prevent the `access-permissions` permission from being removed from the last granted role in the permissions table. This hardening measure ensures that administrators cannot accidentally lock themselves out of the system's permission management screen.

.changeset/three-turkeys-dress.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": patch
3+
"@rocket.chat/rest-typings": patch
4+
---
5+
6+
Adds deprecation warning on `livechat:removeRoom` with new endpoint replacing it; `livechat/rooms.delete`
Lines changed: 332 additions & 332 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ plugins:
1212
- path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
1313
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"
1414

15-
yarnPath: .yarn/releases/yarn-4.9.3.cjs
15+
yarnPath: .yarn/releases/yarn-4.10.3.cjs

apps/meteor/.mocharc.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"reporter": "spec",
44
"extension": ["js", "ts", "tsx"],
55
"require": [
6-
"ts-node/register",
6+
"tsx",
77
"./tests/setup/chaiPlugins.ts"
88
],
99
"watch-files": [

apps/meteor/.mocharc.definition.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66

77
const base = require('./.mocharc.base.json');
88

9-
/**
10-
* Mocha will run `ts-node` without doing type checking to speed-up the tests. It should be fine as `npm run typecheck`
11-
* covers test files too.
12-
*/
13-
14-
Object.assign(
15-
process.env,
16-
{
17-
TS_NODE_FILES: true,
18-
TS_NODE_TRANSPILE_ONLY: true,
19-
},
20-
process.env,
21-
);
22-
239
module.exports = {
2410
...base, // see https://github.com/mochajs/mocha/issues/3916
2511
require: [...base.require],

apps/meteor/.mocharc.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66

77
const base = require('./.mocharc.base.json');
88

9-
/**
10-
* Mocha will run `ts-node` without doing type checking to speed-up the tests. It should be fine as `npm run typecheck`
11-
* covers test files too.
12-
*/
13-
14-
Object.assign(
15-
process.env,
16-
{
17-
TS_NODE_FILES: true,
18-
TS_NODE_TRANSPILE_ONLY: true,
19-
},
20-
process.env,
21-
);
22-
239
module.exports = {
2410
...base, // see https://github.com/mochajs/mocha/issues/3916
2511
exit: true,

0 commit comments

Comments
 (0)