-
Notifications
You must be signed in to change notification settings - Fork 10.3k
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 chor…
…e/split-useUserInfoActions * 'develop' of github.com:RocketChat/Rocket.Chat: (41 commits) Regression: Fix apps wrong typing (#25824) Chore: Remove compose from main repo (#23426) [FIX] `You and @Yourusername reacted with`title on reactions (#25733) [FIX] AgentsPage pagination (#25820) Chore: Move voip's Wrap-up and On-hold functionality to EE (Backend) (#25160) [FIX] Access issue on chat.getThreadsList (#25750) Chore: Remove snap files from Houston config (#25819) [FIX] Voip endpoint permissions (#25783) [FIX] allow only livechat-agents to be contact manager for any omnichannel contact (#25451) Chore: use params instead of URL building on livechat endpoints (#25810) Regression: fix apps path (#25809) [BREAK] Remove RDStation integration (#25774) Chore: RestApiClient as Package (#25469) [FIX] Wrong argument name preventing Omnichannel Chat Forward to User (#25723) [FIX] AccountBox checks for condition (#25708) Chore: Fix CI (#25797) [FIX] Fix prom-client new promise usage (#25781) [FIX] Discussion alphabetical ordering (#25788) Update .kodiak.toml Update .kodiak.toml ...
- Loading branch information
Showing
648 changed files
with
9,022 additions
and
6,042 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 |
---|---|---|
|
@@ -41,4 +41,5 @@ yarn-error.log* | |
!.yarn/sdks | ||
!.yarn/versions | ||
|
||
.nvmrc | ||
.nvmrc | ||
.idea/ |
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.