Skip to content

fix: Prevent invalid sessions update#35010

Merged
ggazzo merged 3 commits intodevelopfrom
prevent-invalid-sessions-update
Jan 23, 2025
Merged

fix: Prevent invalid sessions update#35010
ggazzo merged 3 commits intodevelopfrom
prevent-invalid-sessions-update

Conversation

@sampaiodiego
Copy link
Member

@sampaiodiego sampaiodiego commented Jan 22, 2025

Proposed changes (including videos or screenshots)

Issue(s)

CORE-944

Steps to test or reproduce

Further comments

@changeset-bot
Copy link

changeset-bot bot commented Jan 22, 2025

🦋 Changeset detected

Latest commit: cb84672

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

This PR includes changesets to release 35 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground 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/freeswitch 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/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip 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

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jan 22, 2025

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 7.4.0, but it targets 7.3.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@codecov
Copy link

codecov bot commented Jan 22, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.17%. Comparing base (c8c8eaa) to head (cb84672).
Report is 5 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #35010   +/-   ##
========================================
  Coverage    59.17%   59.17%           
========================================
  Files         2822     2822           
  Lines        68124    68124           
  Branches     15149    15149           
========================================
  Hits         40314    40314           
  Misses       24978    24978           
  Partials      2832     2832           
Flag Coverage Δ
unit 75.00% <ø> (ø)

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

@github-actions
Copy link
Contributor

PR Preview Action v1.6.0

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-35010/

Built to branch gh-pages at 2025-01-22 21:36 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@sampaiodiego sampaiodiego added this to the 7.4.0 milestone Jan 23, 2025
@sampaiodiego sampaiodiego marked this pull request as ready for review January 23, 2025 17:35
@sampaiodiego sampaiodiego requested a review from a team January 23, 2025 18:29
@ggazzo ggazzo added the stat: QA assured Means it has been tested and approved by a company insider label Jan 23, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jan 23, 2025
@ggazzo ggazzo merged commit 9100cec into develop Jan 23, 2025
52 checks passed
@ggazzo ggazzo deleted the prevent-invalid-sessions-update branch January 23, 2025 19:19
@sampaiodiego sampaiodiego modified the milestones: 7.4.0, 7.3.0 Jan 24, 2025
@sampaiodiego
Copy link
Member Author

/backport 7.2.4

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Feb 24, 2025

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-7.2.4-35010
git cherry-pick 9100cecd29e71840c3cbcbae92314b1354beb802
// solve the conflict
git push

after that just run /backport 7.2.4 again

@sampaiodiego
Copy link
Member Author

/backport 7.2.4

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Feb 24, 2025

Pull request #35321 added to Project: "Patch 7.2.4"

@sampaiodiego
Copy link
Member Author

/backport 7.1.4

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Feb 24, 2025

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-7.1.4-35010
git cherry-pick 9100cecd29e71840c3cbcbae92314b1354beb802
// solve the conflict
git push

after that just run /backport 7.1.4 again

@sampaiodiego
Copy link
Member Author

/backport 7.1.4

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Feb 24, 2025

Pull request #35322 added to Project: "Patch 7.1.4"

@sampaiodiego
Copy link
Member Author

/backport 7.0.8

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Feb 24, 2025

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-7.0.8-35010
git cherry-pick 9100cecd29e71840c3cbcbae92314b1354beb802
// solve the conflict
git push

after that just run /backport 7.0.8 again

@sampaiodiego
Copy link
Member Author

/backport 7.0.8

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Feb 24, 2025

Pull request #35323 added to Project: "Patch 7.0.8"

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