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.

Sign up for GitHub

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

Jump to bottom

chore(Sidepanel): uses only local channels and discussions #33387

Merged
merged 5 commits into from
Sep 27, 2024
Merged

chore(Sidepanel): uses only local channels and discussions #33387

merged 5 commits into from
Sep 27, 2024

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Sep 27, 2024 •
edited
Loading

SIDE-162, (opens new window)
SIDE-186, (opens new window)
SIDE-187, (opens new window)

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Sep 27, 2024 •
edited
Loading

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.13.0, but it targets 6.14.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Sep 27, 2024 •
edited
Loading

⚠️ No Changeset found

Latest commit: 6ee7725

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 27, 2024 •
edited
Loading

PR Preview Action v1.4.8
Preview removed because the pull request was closed.
2024-09-27 22:11 UTC

@codecov Codecov
Copy link

codecov bot commented Sep 27, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.35%. Comparing base (a430faf) to head (6ee7725).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #33387   +/-   ##
========================================
  Coverage    58.35%   58.35%           
========================================
  Files         2692     2692           
  Lines        65265    65265           
  Branches     14730    14730           
========================================
  Hits         38084    38084           
  Misses       24403    24403           
  Partials      2778     2778
Flag Coverage Δ
unit 75.32% <ø> (ø)

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

@ggazzo ggazzo added this to the 6.13 milestone Sep 27, 2024
@ggazzo ggazzo marked this pull request as ready for review September 27, 2024 17:50
@ggazzo ggazzo requested a review from a team as a code owner September 27, 2024 17:50
@gabriellsh gabriellsh added the stat: QA assured Means it has been tested and approved by a company insider label Sep 27, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Sep 27, 2024
@ggazzo ggazzo merged commit 214d1b3 into develop Sep 27, 2024
13 of 14 checks passed
@ggazzo ggazzo deleted the chore/sidepanel-only-local branch September 27, 2024 22:11
ggazzo added a commit that referenced this pull request Sep 27, 2024
@ggazzo
chore(Sidepanel): uses only local channels and discussions (#33387)
9f21b58
gabriellsh added a commit that referenced this pull request Sep 30, 2024
@gabriellsh
Merge branch 'feat/airgapped-restrictions' of github.com:RocketChat/R…
4ea5399 
…ocket.Chat into feat/airgapped-restrictions

* 'feat/airgapped-restrictions' of github.com:RocketChat/Rocket.Chat: (57 commits)
  fix: Async E2EE key exchange not working on develop (#33378)
  chore: Move Apps-Engine to monorepo (#32951)
  chore(Sidepanel): uses only local channels and discussions (#33387)
  chore: add gazzodown preview (#33279)
  fix: Avoid notifying `watch.settings` on uncaught errors (#33376)
  fix: race condition when forwarding livechat by splitting subscription removal (#33381)
  chore: Single Contact ID: improved typings and removed some duplicated code (#33324)
  ci: remove Jira-GitHub security integration (#33384)
  chore: add ui-composer to storybook (#33383)
  regression: `Sidepanel` sort requires refresh after room update (#33370)
  ci: use node20 for release action (#33343)
  Bump rocket.chat to 6.14.0-develop (#33366)
  chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356)
  Release 6.13.0-rc.1
  fix: Avoid destructuring `connectionData` when value is undefined (#33339)
  feat: Adds new admin feature preview setting management (#33212)
  regression: `Sidepanel` color highlight (#33342)
  chore: move common files to core-services (#33341)
  feat: Adds new admin feature preview setting management (#33212)
  chore: create network broker package (#33338)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabriellsh gabriellsh gabriellsh approved these changes

Assignees
No one assigned
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
Milestone
6.13
Development

Successfully merging this pull request may close these issues.
2 participants
@ggazzo @gabriellsh