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.

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

fix: imported fixes #32690

Merged
merged 3 commits into from
Jul 2, 2024
Merged

fix: imported fixes #32690

merged 3 commits into from
Jul 2, 2024

Conversation

sampaiodiego
Copy link
Member

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

Copy link
Contributor

dionisio-bot bot commented Jun 27, 2024

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

Copy link

changeset-bot bot commented Jun 27, 2024

🦋 Changeset detected

Latest commit: 3280b16

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

Copy link

codecov bot commented Jun 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.73%. Comparing base (3bffa75) to head (3280b16).
Report is 2 commits behind head on release-6.10.0.

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff               @@
##           release-6.10.0   #32690   +/-   ##
===============================================
  Coverage           56.72%   56.73%           
===============================================
  Files                2496     2497    +1     
  Lines               55360    55375   +15     
  Branches            11455    11459    +4     
===============================================
+ Hits                31405    31418   +13     
+ Misses              21284    21256   -28     
- Partials             2671     2701   +30     
Flag Coverage Δ
e2e 56.48% <ø> (+<0.01%) ⬆️
unit 71.86% <ø> (+0.02%) ⬆️

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

Signed-off-by: Abhinav Kumar <[email protected]>
@sampaiodiego sampaiodiego marked this pull request as ready for review June 29, 2024 00:05
@sampaiodiego sampaiodiego requested review from a team as code owners June 29, 2024 00:05
@sampaiodiego sampaiodiego added this to the 6.10 milestone Jun 29, 2024
@ggazzo ggazzo added the stat: QA assured Means it has been tested and approved by a company insider label Jul 2, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 2, 2024
@ggazzo ggazzo merged commit 2bd8c98 into release-6.10.0 Jul 2, 2024
50 checks passed
@ggazzo ggazzo deleted the imported-fixes branch July 2, 2024 13:45
@sampaiodiego
Copy link
Member Author

/backport 6.9.4

Copy link
Contributor

dionisio-bot bot commented Jul 17, 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.4-32690
git cherry-pick 2bd8c98396d283a39107bc3e90ff6c950f9efd78
// solve the conflict
git push

after that just run /backport 6.9.4 again

sampaiodiego added a commit that referenced this pull request Jul 17, 2024
@sampaiodiego
Copy link
Member Author

/backport 6.9.4

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

dionisio-bot bot commented Jul 17, 2024

Pull request #32823 added to Project: "Patch 6.9.4"

sampaiodiego added a commit that referenced this pull request Jul 23, 2024
sampaiodiego added a commit that referenced this pull request Jul 23, 2024
sampaiodiego added a commit that referenced this pull request Jul 23, 2024
sampaiodiego added a commit that referenced this pull request Jul 23, 2024
@sampaiodiego
Copy link
Member Author

/backport 6.8.4

Copy link
Contributor

dionisio-bot bot commented Jul 23, 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.4-32690
git cherry-pick 2bd8c98396d283a39107bc3e90ff6c950f9efd78
// solve the conflict
git push

after that just run /backport 6.8.4 again

sampaiodiego added a commit that referenced this pull request Jul 23, 2024
@sampaiodiego
Copy link
Member Author

/backport 6.8.4

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

dionisio-bot bot commented Jul 23, 2024

Pull request #32875 added to Project: "Patch 6.8.4"

@sampaiodiego
Copy link
Member Author

/backport 6.7.6

Copy link
Contributor

dionisio-bot bot commented Jul 23, 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.6-32690
git cherry-pick 2bd8c98396d283a39107bc3e90ff6c950f9efd78
// solve the conflict
git push

after that just run /backport 6.7.6 again

sampaiodiego added a commit that referenced this pull request Jul 23, 2024
@sampaiodiego
Copy link
Member Author

/backport 6.7.6

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

dionisio-bot bot commented Jul 23, 2024

Pull request #32878 added to Project: "Patch 6.7.6"

@sampaiodiego
Copy link
Member Author

/backport 6.6.11

Copy link
Contributor

dionisio-bot bot commented Jul 23, 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.11-32690
git cherry-pick 2bd8c98396d283a39107bc3e90ff6c950f9efd78
// solve the conflict
git push

after that just run /backport 6.6.11 again

sampaiodiego added a commit that referenced this pull request Jul 23, 2024
@sampaiodiego
Copy link
Member Author

/backport 6.6.11

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

dionisio-bot bot commented Jul 23, 2024

Pull request #32881 added to Project: "Patch 6.6.11"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

4 participants