Skip to content

Comments

fix: imported fixes#33246

Merged
kodiakhq[bot] merged 3 commits intodevelopfrom
imported-fixes-2024-09-09
Sep 12, 2024
Merged

fix: imported fixes#33246
kodiakhq[bot] merged 3 commits intodevelopfrom
imported-fixes-2024-09-09

Conversation

@julio-cfa
Copy link
Contributor

@julio-cfa julio-cfa commented Sep 10, 2024

Proposed changes (including videos or screenshots)

These fixes need to be in 6.13.0, 6.12.1, and backported to 6.11.3, 6.10.6, 6.9.7, 6.8.7, and 6.7.9.

Issue(s)

Steps to test or reproduce

Further comments

@julio-cfa julio-cfa requested review from a team as code owners September 10, 2024 19:31
@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Sep 10, 2024

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

@changeset-bot
Copy link

changeset-bot bot commented Sep 10, 2024

🦋 Changeset detected

Latest commit: 53aaf68

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/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/uikit-playground 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

KevLehman
KevLehman previously approved these changes Sep 10, 2024
rique223
rique223 previously approved these changes Sep 10, 2024
@codecov
Copy link

codecov bot commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.73%. Comparing base (41a1816) to head (53aaf68).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #33246   +/-   ##
========================================
  Coverage    59.73%   59.73%           
========================================
  Files         2548     2548           
  Lines        63073    63075    +2     
  Branches     14090    14090           
========================================
+ Hits         37679    37681    +2     
  Misses       22978    22978           
  Partials      2416     2416           
Flag Coverage Δ
unit 76.95% <100.00%> (+<0.01%) ⬆️

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

@julio-cfa julio-cfa added this to the 6.12 milestone Sep 10, 2024
@rodrigok rodrigok modified the milestones: 6.12, 6.13 Sep 11, 2024
@julio-cfa julio-cfa changed the base branch from release-6.12.1 to develop September 11, 2024 13:32
@julio-cfa julio-cfa dismissed rique223’s stale review September 11, 2024 13:32

The base branch was changed.

@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 Sep 12, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Sep 12, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Sep 12, 2024

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-09-12 15:06 UTC

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

/backport 6.7.9

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

dionisio-bot bot commented Sep 12, 2024

Pull request #33274 added to Project: "Patch 6.7.9"

@julio-cfa
Copy link
Contributor Author

/backport 6.2.13

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 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.2.13-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.2.13 again

@julio-cfa
Copy link
Contributor Author

/backport 6.2.13

@julio-cfa julio-cfa mentioned this pull request Oct 3, 2024
@julio-cfa
Copy link
Contributor Author

/backport 6.1.9

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 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.1.9-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.1.9 again

@julio-cfa julio-cfa mentioned this pull request Oct 3, 2024
@julio-cfa
Copy link
Contributor Author

/backport 6.0.9

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 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.0.9-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.0.9 again

@julio-cfa julio-cfa mentioned this pull request Oct 3, 2024
@julio-cfa
Copy link
Contributor Author

/backport 5.4.11

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 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-5.4.11-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 5.4.11 again

@julio-cfa
Copy link
Contributor Author

/backport 6.3.13

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 4, 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.3.13-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.3.13 again

@julio-cfa julio-cfa mentioned this pull request Oct 4, 2024
@julio-cfa
Copy link
Contributor Author

/backport 6.4.10

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 4, 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.4.10-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.4.10 again

@julio-cfa julio-cfa mentioned this pull request Oct 4, 2024
@julio-cfa
Copy link
Contributor Author

/backport 6.5.9

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 4, 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.5.9-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.5.9 again

@julio-cfa julio-cfa mentioned this pull request Oct 4, 2024
@julio-cfa
Copy link
Contributor Author

/backport 6.6.13

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Oct 4, 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.13-33246
git cherry-pick 7cb6de00336dcec878edcb223e7bb6158a848565
// solve the conflict
git push

after that just run /backport 6.6.13 again

@julio-cfa julio-cfa mentioned this pull request Oct 4, 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.

5 participants