Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: imported fixes #32894

Merged
merged 4 commits into from
Jul 24, 2024
Merged

fix: imported fixes #32894

merged 4 commits into from
Jul 24, 2024

Conversation

sampaiodiego
Copy link
Member

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

julio-cfa and others added 2 commits July 24, 2024 15:41
@julio-cfa @njgrc @sampaiodiego
fix: security hotfix
4fa9310 
---------

Co-authored-by: njgrc <145460309+njgrc@users.noreply.github.com>
@sampaiodiego
doc: add changeset
bedef30
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 24, 2024 •
edited
Loading

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Jul 24, 2024 •
edited
Loading

🦋 Changeset detected

Latest commit: bda05ee

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

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron 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/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/web-ui-registration 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

@CLAassistant
Copy link

CLAassistant commented Jul 24, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@codecov Codecov
Copy link

codecov bot commented Jul 24, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 89.83051% with 6 lines in your changes missing coverage. Please review.

Project coverage is 56.63%. Comparing base (3bfdd71) to head (bda05ee).

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff               @@
##           release-6.10.1   #32894   +/-   ##
===============================================
  Coverage           56.63%   56.63%           
===============================================
  Files                2502     2504    +2     
  Lines               55557    55614   +57     
  Branches            11476    11490   +14     
===============================================
+ Hits                31462    31497   +35     
- Misses              21404    21423   +19     
- Partials             2691     2694    +3
Flag Coverage Δ
e2e 56.45% <ø> (-0.03%) ⬇️
unit 71.70% <89.83%> (-0.01%) ⬇️

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

@sampaiodiego sampaiodiego marked this pull request as ready for review July 24, 2024 22:26
@sampaiodiego sampaiodiego requested review from a team as code owners July 24, 2024 22:26
@sampaiodiego sampaiodiego added this to the 6.10 milestone Jul 24, 2024
@sampaiodiego sampaiodiego added the stat: QA assured Means it has been tested and approved by a company insider label Jul 24, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 24, 2024
@sampaiodiego sampaiodiego merged commit ce072a1 into release-6.10.1 Jul 24, 2024
50 checks passed
@sampaiodiego sampaiodiego deleted the imported-fixes-2024-07-24 branch July 24, 2024 23:35
@rocketchat-github-ci rocketchat-github-ci mentioned this pull request Jul 24, 2024
Merged
@sampaiodiego
Copy link
Member Author

/backport 6.9.5

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 26, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.9.5-32894
git cherry-pick ce072a1a70c86f90a4f502cdc0bad92d79f6e6e9
// solve the conflict
git push

after that just run /backport 6.9.5 again

sampaiodiego added a commit that referenced this pull request Jul 26, 2024
@sampaiodiego @julio-cfa
fix: imported fixes (#32894)
7956526 
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
@sampaiodiego
Copy link
Member Author

/backport 6.9.5

@dionisio-bot dionisio-bot bot mentioned this pull request Jul 26, 2024
Merged
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 26, 2024

Pull request #32918 added to Project: "Patch 6.9.5"

@sampaiodiego
Copy link
Member Author

/backport 6.8.5

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 26, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.8.5-32894
git cherry-pick ce072a1a70c86f90a4f502cdc0bad92d79f6e6e9
// solve the conflict
git push

after that just run /backport 6.8.5 again

sampaiodiego added a commit that referenced this pull request Jul 26, 2024
@sampaiodiego @julio-cfa
fix: imported fixes (#32894)
6312f7c 
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
@sampaiodiego
Copy link
Member Author

/backport 6.8.5

@dionisio-bot dionisio-bot bot mentioned this pull request Jul 26, 2024
Merged
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 26, 2024

Pull request #32919 added to Project: "Patch 6.8.5"

@sampaiodiego
Copy link
Member Author

/backport 6.7.7

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 26, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.7.7-32894
git cherry-pick ce072a1a70c86f90a4f502cdc0bad92d79f6e6e9
// solve the conflict
git push

after that just run /backport 6.7.7 again

sampaiodiego added a commit that referenced this pull request Jul 29, 2024
@sampaiodiego @julio-cfa
fix: imported fixes (#32894)
e50740e 
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
@sampaiodiego
Copy link
Member Author

/backport 6.7.7

@dionisio-bot dionisio-bot bot mentioned this pull request Jul 29, 2024
Merged
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 29, 2024

Pull request #32926 added to Project: "Patch 6.7.7"

sampaiodiego added a commit that referenced this pull request Jul 29, 2024
@dionisio-bot @sampaiodiego @julio-cfa
fix: imported fixes (#32894) (#32919)
ce21727 
Co-authored-by: Diego Sampaio <chinello@gmail.com>
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
@sampaiodiego
Copy link
Member Author

/backport 6.6.12

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 29, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.6.12-32894
git cherry-pick ce072a1a70c86f90a4f502cdc0bad92d79f6e6e9
// solve the conflict
git push

after that just run /backport 6.6.12 again

sampaiodiego added a commit that referenced this pull request Jul 29, 2024
@sampaiodiego @julio-cfa
fix: imported fixes (#32894)
b6d0d80 
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
@sampaiodiego
Copy link
Member Author

/backport 6.6.12

@dionisio-bot dionisio-bot bot mentioned this pull request Jul 29, 2024
Merged
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jul 29, 2024

Pull request #32927 added to Project: "Patch 6.6.12"

sampaiodiego added a commit that referenced this pull request Jul 29, 2024
@dionisio-bot @sampaiodiego @julio-cfa
fix: imported fixes (#32894) (#32918)
73e04ca 
Co-authored-by: Diego Sampaio <chinello@gmail.com>
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
sampaiodiego added a commit that referenced this pull request Jul 29, 2024
@dionisio-bot @sampaiodiego @julio-cfa
fix: imported fixes (#32894) (#32926)
6b93750 
Co-authored-by: Diego Sampaio <chinello@gmail.com>
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
sampaiodiego added a commit that referenced this pull request Jul 29, 2024
@dionisio-bot @sampaiodiego @julio-cfa
fix: imported fixes (#32894) (#32927)
779697f 
Co-authored-by: Diego Sampaio <chinello@gmail.com>
Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com>
gabriellsh added a commit that referenced this pull request Jul 31, 2024
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into impr…
c93b920 
…ove/threadMetrics

* 'develop' of github.com:RocketChat/Rocket.Chat: (26 commits)
  chore: Bump rocket.chat to 6.12.0-develop (#32936)
  test: Move Jest configuration to a package of presets (#32802)
  chore: bump turbo (#32938)
  feat: New users page deactivated tab and active tab ui (#32032)
  chore: bump traefik (#32892)
  test: fix flaky test `Archive department` (#32933)
  fix(Livechat): `After Registration Triggers` showing in wrong screen (#32928)
  refactor: Remove deprecated `Options.AvatarSize` constant (#32909)
  chore: improve `on login` cached collection (#32929)
  i18n: Rocket.Chat language update from Lingohub 🤖 on 2024-07-25Z (#32908)
  refactor: Circular imports (#32885)
  regression: notify user properly on logout (#32920)
  chore(client): stop replacing  `Meteor.user` (#32910)
  regression: Messagebox sending message instead of just selecting popup suggestion (#32890)
  refactor: move broadcastMessageFromData to notifyListener (#32843)
  chore: prevent destructuring _id of deleted users (#32899)
  ci: increase kernel limits (#32902)
  ci: lint issues
  Release 6.10.1
  fix: imported fixes (#32894)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@julio-cfa julio-cfa

Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Milestone
6.10
Development

Successfully merging this pull request may close these issues.
3 participants
@sampaiodiego @CLAassistant @julio-cfa