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

Merged
merged 2 commits into from
Aug 23, 2024
Merged

fix: imported fixes #33136

merged 2 commits into from
Aug 23, 2024

Conversation

julio-cfa
Copy link
Member

@julio-cfa julio-cfa commented Aug 23, 2024

Proposed changes (including videos or screenshots)

Latest security changes. Should be backported to 6.11.x, 6.10.x, 6.9.x, 6.8.x, and 6.7.x.

Issue(s)

VLN-52
VLN-27

Steps to test or reproduce

Further comments

@julio-cfa julio-cfa requested review from a team as code owners August 23, 2024 13:00
Copy link
Contributor

dionisio-bot bot commented Aug 23, 2024

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.12.0, but it targets 6.11.1

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Aug 23, 2024

🦋 Changeset detected

Latest commit: d93edf2

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

KevLehman
KevLehman previously approved these changes Aug 23, 2024
@julio-cfa julio-cfa added this to the 6.12 milestone Aug 23, 2024
Copy link

codecov bot commented Aug 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.39%. Comparing base (12e000d) to head (d93edf2).
Report is 119 commits behind head on release-6.12.0.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                 @@
##           release-6.12.0   #33136      +/-   ##
==================================================
+ Coverage           56.78%   59.39%   +2.61%     
==================================================
  Files                2510     2548      +38     
  Lines               55836    63553    +7717     
  Branches            11525    14351    +2826     
==================================================
+ Hits                31704    37746    +6042     
- Misses              21474    23072    +1598     
- Partials             2658     2735      +77     
Flag Coverage Δ
unit 75.54% <100.00%> (+3.60%) ⬆️

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

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge stat: QA assured Means it has been tested and approved by a company insider and removed stat: QA tested labels Aug 23, 2024
@kodiakhq kodiakhq bot merged commit ac08452 into release-6.12.0 Aug 23, 2024
53 checks passed
@kodiakhq kodiakhq bot deleted the imported-fixes-2024-08-23 branch August 23, 2024 14:36
@julio-cfa
Copy link
Member Author

/backport 6.10.5

Copy link
Contributor

dionisio-bot bot commented Aug 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.10.5-33136
git cherry-pick ac084524171073a01e7121bc0f0483ad05093f1d
// solve the conflict
git push

after that just run /backport 6.10.5 again

julio-cfa added a commit that referenced this pull request Aug 23, 2024
@julio-cfa
Copy link
Member Author

/backport 6.10.5

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

dionisio-bot bot commented Aug 23, 2024

Pull request #33142 added to Project: "Patch 6.10.5"

@julio-cfa
Copy link
Member Author

/backport 6.11.2

dionisio-bot bot pushed a commit that referenced this pull request Aug 26, 2024
@dionisio-bot dionisio-bot bot mentioned this pull request Aug 26, 2024
Copy link
Contributor

dionisio-bot bot commented Aug 26, 2024

Pull request #33153 added to Project: "Patch 6.11.2"

@julio-cfa
Copy link
Member Author

/backport 6.9.6

Copy link
Contributor

dionisio-bot bot commented Aug 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.6-33136
git cherry-pick ac084524171073a01e7121bc0f0483ad05093f1d
// solve the conflict
git push

after that just run /backport 6.9.6 again

julio-cfa added a commit that referenced this pull request Aug 26, 2024
@julio-cfa
Copy link
Member Author

/backport 6.9.6

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

dionisio-bot bot commented Aug 26, 2024

Pull request #33161 added to Project: "Patch 6.9.6"

@julio-cfa
Copy link
Member Author

/backport 6.8.6

Copy link
Contributor

dionisio-bot bot commented Sep 3, 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.6-33136
git cherry-pick ac084524171073a01e7121bc0f0483ad05093f1d
// solve the conflict
git push

after that just run /backport 6.8.6 again

julio-cfa added a commit that referenced this pull request Sep 3, 2024
@julio-cfa
Copy link
Member Author

/backport 6.8.6

@dionisio-bot dionisio-bot bot mentioned this pull request Sep 3, 2024
Copy link
Contributor

dionisio-bot bot commented Sep 3, 2024

Pull request #33202 added to Project: "Patch 6.8.6"

@julio-cfa
Copy link
Member Author

/backport 6.7.8

Copy link
Contributor

dionisio-bot bot commented Sep 3, 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.8-33136
git cherry-pick ac084524171073a01e7121bc0f0483ad05093f1d
// solve the conflict
git push

after that just run /backport 6.7.8 again

julio-cfa added a commit that referenced this pull request Sep 3, 2024
@julio-cfa
Copy link
Member Author

/backport 6.7.8

@dionisio-bot dionisio-bot bot mentioned this pull request Sep 3, 2024
Copy link
Contributor

dionisio-bot bot commented Sep 3, 2024

Pull request #33203 added to Project: "Patch 6.7.8"

abhinavkrin pushed a commit that referenced this pull request Oct 25, 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