-
Notifications
You must be signed in to change notification settings - Fork 10.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new/…
…homepage * 'develop' of github.com:RocketChat/Rocket.Chat: Chore: Fix CI (#25797) [FIX] Fix prom-client new promise usage (#25781) [FIX] Discussion alphabetical ordering (#25788) Update .kodiak.toml Update .kodiak.toml Chore: Testing Kodiak feature (#25794) [FIX] Broken Omnichannel>Agents page (#25731) [FIX] Sanitize styles in message (#25744) chore: Convert to TS RoomAutoComplete (#25536) Chore: API test on method GET with params as a number. (#25769) Chore: convert invites, misc and subscriptions to TS and create definitions (#25350) Chore: Remove .snapcraft Chore: Remove toastr package (#25787) [BREAK] Remove Blockstack authentication (#25649) [FIX] getUserMentionsByChannel method room permission (#25748) [NEW] Fuselage ToastBar (#25583)
- Loading branch information
Showing
109 changed files
with
2,301 additions
and
2,622 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# .kodiak.toml | ||
version = 1 | ||
|
||
|
||
[merge] | ||
method = "squash" | ||
automerge_label = ["stat: ready to merge", "QA tested", "automerge"] | ||
|
||
[merge.message] | ||
title = "pull_request_title" # default: "github_default" | ||
body = "pull_request_body" # default: "github_default" | ||
include_coauthors=true | ||
[merge.automerge_dependencies] | ||
versions = ["minor", "patch"] | ||
usernames = ["dependabot"] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,3 +11,4 @@ plugins: | |
spec: '@yarnpkg/plugin-typescript' | ||
|
||
yarnPath: .yarn/releases/yarn-3.2.0.cjs | ||
checksumBehavior: 'ignore' |
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.