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 #33062

Merged
merged 1 commit into from
Aug 15, 2024
Merged

fix: imported fixes #33062

merged 1 commit into from
Aug 15, 2024

Conversation

julio-cfa
Copy link
Member

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@julio-cfa julio-cfa requested review from a team as code owners August 15, 2024 01:36
Copy link
Contributor

dionisio-bot bot commented Aug 15, 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 Aug 15, 2024

🦋 Changeset detected

Latest commit: a6d4702

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 Aug 15, 2024

Codecov Report

Attention: Patch coverage is 83.33333% with 2 lines in your changes missing coverage. Please review.

Project coverage is 55.62%. Comparing base (640d569) to head (a6d4702).
Report is 2 commits behind head on release-6.11.1.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                 @@
##           release-6.11.1   #33062      +/-   ##
==================================================
- Coverage           56.79%   55.62%   -1.18%     
==================================================
  Files                2510     2636     +126     
  Lines               55758    57507    +1749     
  Branches            11494    11934     +440     
==================================================
+ Hits                31668    31987     +319     
- Misses              21430    22798    +1368     
- Partials             2660     2722      +62     
Flag Coverage Δ
e2e 54.29% <ø> (-2.11%) ⬇️
unit 71.88% <83.33%> (-0.40%) ⬇️

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

@julio-cfa julio-cfa added this to the 6.11 milestone Aug 15, 2024
@julio-cfa julio-cfa added the stat: QA assured Means it has been tested and approved by a company insider label Aug 15, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Aug 15, 2024
@julio-cfa julio-cfa force-pushed the imported-fixes-2024-08-14 branch 5 times, most recently from bf6910c to b38dce7 Compare August 15, 2024 15:11
@julio-cfa julio-cfa requested a review from a team as a code owner August 15, 2024 15:11
@sampaiodiego sampaiodiego merged commit b3ac6d9 into release-6.11.1 Aug 15, 2024
48 of 49 checks passed
@sampaiodiego sampaiodiego deleted the imported-fixes-2024-08-14 branch August 15, 2024 21:02
@sampaiodiego
Copy link
Member

/backport 6.10.3

Copy link
Contributor

dionisio-bot bot commented Aug 15, 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.10.3-33062
git cherry-pick b3ac6d93ae36af9ddd7cf750e34301891ccd2579
// solve the conflict
git push

after that just run /backport 6.10.3 again

sampaiodiego pushed a commit that referenced this pull request Aug 15, 2024
@sampaiodiego
Copy link
Member

/backport 6.10.3

@dionisio-bot dionisio-bot bot mentioned this pull request Aug 15, 2024
Copy link
Contributor

dionisio-bot bot commented Aug 15, 2024

Pull request #33069 added to Project: "Patch 6.10.3"

sampaiodiego pushed a commit that referenced this pull request Aug 15, 2024
sampaiodiego pushed a commit that referenced this pull request Aug 16, 2024
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.

2 participants