Skip to content

[pull] develop from RocketChat:develop - #1375

Open
pull[bot] wants to merge 10000 commits into
stackriot:developfrom
RocketChat:develop
Open

pull[bot] wants to merge 10000 commits into
stackriot:developfrom
RocketChat:develop

Conversation

@pull

@pull pull Bot commented Apr 23, 2021 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

Martin Schoeler and others added 23 commits October 21, 2026 01:52
…2496)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
Co-authored-by: Abhinav Kumar <abhinav@avitechlab.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…42925)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: デワンシュ <61188295+Dnouv@users.noreply.github.com>
Guilherme Gazzo and others added 30 commits November 4, 2026 15:01
Co-authored-by: Claude <noreply@anthropic.com>
…43499)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ding (#43510)

Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
Bumps @rocket.chat/federation-sdk from 0.9.0 to 0.9.1, which includes
RocketChat/homeserver#417. Requests from servers that send unquoted
parameters in the X-Matrix header were being rejected.
# Conflicts:
#	.github/workflows/ci-code-check.yml
#	apps/meteor/ee/server/api/apps/uikit.ts
#	apps/meteor/ee/server/api/federation.ts
#	apps/meteor/ee/server/api/mcp/metadata.ts
#	apps/meteor/package.json
#	apps/meteor/rocketchat.info
#	apps/meteor/server/configuration/configurePassport.ts
#	apps/meteor/server/lib/auth/oauth2-server/oauth2-server.ts
#	apps/meteor/server/lib/notifications/queue/NotificationQueue.test.ts
#	apps/meteor/server/main.ts
#	apps/meteor/server/modules/apps/bridges/api.ts
#	apps/meteor/server/routes/health.ts
#	apps/meteor/server/routes/timesync.ts
#	apps/meteor/server/settings/theme/server.ts
#	apps/meteor/server/startup/initialData.test.ts
#	package.json
#	packages/core-typings/package.json
#	packages/rest-typings/package.json
The release-9.0.0 merge into develop left apps/meteor on 0.9.0 while the
other workspaces and the lockfile moved to 0.9.1, so the immutable install
in CI fails.
…e merge

The SAML startup tests from #43459 met two develop changes in the
release-9.0.0 merge: startup.ts now awaits addSettings at the top level
(#43478), which the CJS test loader cannot transform, and lib/settings
reads getURL (#43353), which loads the real server settings.

Move the provider loading out of startup.ts into serviceProviders.ts,
which startup.ts starts after registering the settings, and stub getURL
in the test.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.