Skip to content

Commit eff476c

Browse files
authored
Merge branch 'RocketChat:develop' into fix/message-separator-today-label
2 parents f38f930 + 80b0f14 commit eff476c

67 files changed

Lines changed: 557 additions & 256 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/ninety-lilies-kick.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@rocket.chat/gazzodown': patch
3+
'@rocket.chat/i18n': patch
4+
'@rocket.chat/meteor': patch
5+
---
6+
7+
Fixes Insert Timestamp relative time preview not updating on input changes and losing the user's locale after the first refresh tick.

.changeset/spicy-phones-breathe.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/abac": patch
4+
---
5+
6+
Fixes an issue where some actions made by the abac service were not broadcasting to clients, which affected reactivity

.changeset/ten-lizards-divide.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+
Fixes issue that displayed the 'Delete all closed chats' button when user lacks `remove-closed-livechat-rooms` permission

.github/workflows/ci-code-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
install: true
4242
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4343

44-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
44+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
4545

4646
- uses: ./.github/actions/restore-packages
4747

.github/workflows/ci-deploy-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-24.04-arm
1313
steps:
1414
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
15+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
1616

1717
- name: Setup NodeJS
1818
uses: ./.github/actions/setup-node

.github/workflows/ci-test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
install: true
126126
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
127127

128-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
128+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
129129

130130
- uses: ./.github/actions/restore-packages
131131

.github/workflows/ci-test-storybook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
install: true
3838
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
3939

40-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
40+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
4141

4242
- uses: ./.github/actions/restore-packages
4343

.github/workflows/ci-test-unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
install: true
4242
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4343

44-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
44+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
4545

4646
- uses: ./.github/actions/restore-packages
4747

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
restore-keys: |
247247
vite-local-cache-${{ runner.arch }}-${{ runner.os }}-
248248
249-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
249+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
250250
if: steps.packages-cache-build.outputs.cache-hit != 'true'
251251

252252
- name: Build Rocket.Chat Packages
@@ -695,7 +695,7 @@ jobs:
695695
cache-modules: true
696696
install: true
697697

698-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
698+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
699699

700700
- name: Restore turbo build
701701
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

.github/workflows/new-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
install: true
3939
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4040

41-
- uses: rharkor/caching-for-turbo@564b6d155a4aec5ada97411ba7f7956e4bac890a # v2.4.0
41+
- uses: rharkor/caching-for-turbo@2f61e9bebb2f51f2ed041ce70377b0f81b3b1e0d # v2.4.1
4242

4343
- name: Build packages
4444
run: yarn build

0 commit comments

Comments
 (0)