fix: imported fixes #33330

julio-cfa · 2024-09-20T22:48:20Z

Proposed changes (including videos or screenshots)

No need to backport these ones.

Issue(s)

VLN-33
VLN-67

Steps to test or reproduce

N/A

Further comments

N/A

changeset-bot · 2024-09-20T22:48:24Z

🦋 Changeset detected

Latest commit: 92c2fd0

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 28 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/api-client	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/livechat	Patch
@rocket.chat/model-typings	Patch
@rocket.chat/ui-contexts	Patch
@rocket.chat/account-service	Patch
@rocket.chat/authorization-service	Patch
@rocket.chat/ddp-streamer	Patch
@rocket.chat/omnichannel-transcript	Patch
@rocket.chat/presence-service	Patch
@rocket.chat/queue-worker	Patch
@rocket.chat/stream-hub-service	Patch
@rocket.chat/license	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/models	Patch
@rocket.chat/instance-status	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

dionisio-bot · 2024-09-20T22:48:25Z

Looks like this PR is not ready to merge, because of the following issues:

This PR is targeting the wrong base branch. It should target 6.14.0, but it targets 6.13.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

github-actions · 2024-09-20T22:50:06Z

PR Preview Action v1.4.8
Preview removed because the pull request was closed.
2024-09-23 19:37 UTC

codecov · 2024-09-20T22:53:42Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.89%. Comparing base (9bcb802) to head (92c2fd0).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop   #33330   +/-   ##
========================================
  Coverage    59.89%   59.89%           
========================================
  Files         2555     2555           
  Lines        63082    63081    -1     
  Branches     14151    14150    -1     
========================================
  Hits         37781    37781           
+ Misses       22898    22897    -1     
  Partials      2403     2403

Flag	Coverage Δ
unit	`77.19% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

rique223

LGTM frontend wise

rique223

LGTM Frontend wise

* Bump 6.12.1 * fix: message parser being slow to process very long messages with too many symbols (#33254) Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> * fix: Allow to use the token from `room.v` when requesting transcript instead of finding visitor (#33242) Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com> * fix: Retention Policy cached settings not updated during upgrade procedure (#33265) Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> * fix: imported fixes (#33268) Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com> * Release 6.12.1 [no ci] * fix: Federation callback not awaiting model call (#33298) * fix: correct parameter order in afterSaveMessage to restore outgoing webhooks and related features (#33295) * feat: New endpoint for listing rooms & discussions from teams (#33177) * chore: Update typings on callbacks to accept less than a full room object (#33305) * fix: resolve avatar download issue on setUsername by refining service selection logic (#33193) * feat: Allow managing association to business units on departments' creation and update (#32682) * fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> * fix: Mark as unread not working (#32939) Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> * refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309) * fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209) * fix: error on sendmessage stub (#33317) * feat: contextualbar based on chat size (#33321) * feat: `RoomSidepanel` (#33225) Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com> * ci: auto candidate releases (#33325) Co-authored-by: Diego Sampaio <chinello@gmail.com> * refactor: Reactions set/unset (#32994) * feat: E2EE messages mentions (#32510) * fix: markdown inconsistency with bold and italics (#33157) * fix: conference calls are shown as "not answered" after they end (#33179) * Release 6.13.0-rc.0 * chore: update E2EE setting text (#33226) * feat: Implement proper accessbility for report user modal (#33294) Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> * fix: imported fixes (#33330) * chore: create network broker package (#33338) * feat: Adds new admin feature preview setting management (#33212) Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> * chore: move common files to core-services (#33341) * regression: `Sidepanel` color highlight (#33342) * feat: Adds new admin feature preview setting management (#33212) Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> * fix: Avoid destructuring `connectionData` when value is undefined (#33339) * Release 6.13.0-rc.1 [no ci] * chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356) * Bump rocket.chat to 6.14.0-develop (#33366) * ci: use node20 for release action (#33343) --------- Co-authored-by: rocketchat-github-ci <buildmaster@rocket.chat> Co-authored-by: dionisio-bot[bot] <117394943+dionisio-bot[bot]@users.noreply.github.com> Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com> Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com> Co-authored-by: Ricardo Garim <rswarovsky@gmail.com> Co-authored-by: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com> Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat> Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat> Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> Co-authored-by: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com> Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com> Co-authored-by: Diego Sampaio <chinello@gmail.com> Co-authored-by: Hugo Costa <hugocarreiracosta@gmail.com> Co-authored-by: csuadev <72958726+csuadev@users.noreply.github.com> Co-authored-by: Henrique Guimarães Ribeiro <43561537+rique223@users.noreply.github.com> Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> Co-authored-by: Lucas Pelegrino <lucas.pelegrino@icloud.com> Co-authored-by: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>

…apped/composer-restriction * 'develop' of github.com:RocketChat/Rocket.Chat: (55 commits) regression: `Sidepanel` sort requires refresh after room update (#33370) ci: use node20 for release action (#33343) Bump rocket.chat to 6.14.0-develop (#33366) chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356) Release 6.13.0-rc.1 fix: Avoid destructuring `connectionData` when value is undefined (#33339) feat: Adds new admin feature preview setting management (#33212) regression: `Sidepanel` color highlight (#33342) chore: move common files to core-services (#33341) feat: Adds new admin feature preview setting management (#33212) chore: create network broker package (#33338) fix: imported fixes (#33330) feat: Implement proper accessbility for report user modal (#33294) chore: update E2EE setting text (#33226) Release 6.13.0-rc.0 fix: conference calls are shown as "not answered" after they end (#33179) fix: markdown inconsistency with bold and italics (#33157) feat: E2EE messages mentions (#32510) refactor: Reactions set/unset (#32994) ci: auto candidate releases (#33325) ...

fix: security hotfix

3f707fb

julio-cfa requested review from a team as code owners September 20, 2024 22:48

docs: add changeset

c162dca

julio-cfa force-pushed the imported-fixes-2024-09-21 branch from ba28da0 to c162dca Compare September 21, 2024 00:37

KevLehman approved these changes Sep 23, 2024

View reviewed changes

rique223 requested changes Sep 23, 2024

View reviewed changes

rique223 approved these changes Sep 23, 2024

View reviewed changes

julio-cfa added the stat: QA tested label Sep 23, 2024

dionisio-bot bot added stat: QA assured Means it has been tested and approved by a company insider and removed stat: QA tested labels Sep 23, 2024

julio-cfa added the stat: ready to merge PR tested and approved waiting for merge label Sep 23, 2024

Merge branch 'develop' into imported-fixes-2024-09-21

92c2fd0

julio-cfa added this to the 6.14 milestone Sep 23, 2024

kodiakhq bot merged commit 827850d into develop Sep 23, 2024
50 checks passed

kodiakhq bot deleted the imported-fixes-2024-09-21 branch September 23, 2024 19:37

ggazzo modified the milestones: 6.14, 7.0 Oct 17, 2024

This was referenced Oct 20, 2024

Release 7.0.0 #33677

Closed

Release 7.0.0 #33678

Closed

Release 7.0.0 #33679

Merged

abhinavkrin pushed a commit that referenced this pull request Oct 25, 2024

fix: imported fixes (#33330)

62840a9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: imported fixes #33330

fix: imported fixes #33330

julio-cfa commented Sep 20, 2024 •

edited by jira bot

Loading

changeset-bot bot commented Sep 20, 2024 •

edited

Loading

dionisio-bot bot commented Sep 20, 2024 •

edited

Loading

github-actions bot commented Sep 20, 2024 •

edited

Loading

codecov bot commented Sep 20, 2024 •

edited

Loading

rique223 left a comment

rique223 left a comment

fix: imported fixes #33330

fix: imported fixes #33330

Conversation

julio-cfa commented Sep 20, 2024 • edited by jira bot Loading

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

changeset-bot bot commented Sep 20, 2024 • edited Loading

🦋 Changeset detected

dionisio-bot bot commented Sep 20, 2024 • edited Loading

github-actions bot commented Sep 20, 2024 • edited Loading

codecov bot commented Sep 20, 2024 • edited Loading

Codecov Report

rique223 left a comment

Choose a reason for hiding this comment

rique223 left a comment

Choose a reason for hiding this comment

julio-cfa commented Sep 20, 2024 •

edited by jira bot

Loading

changeset-bot bot commented Sep 20, 2024 •

edited

Loading

dionisio-bot bot commented Sep 20, 2024 •

edited

Loading

github-actions bot commented Sep 20, 2024 •

edited

Loading

codecov bot commented Sep 20, 2024 •

edited

Loading