Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
Browse files Browse the repository at this point in the history
…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
gabriellsh committed Jun 10, 2022
2 parents 0a4e919 + a358017 commit d17602f
Show file tree
Hide file tree
Showing 648 changed files with 9,022 additions and 6,042 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ yarn-error.log*
!.yarn/sdks
!.yarn/versions

.nvmrc
.nvmrc
.idea/
16 changes: 16 additions & 0 deletions .kodiak.toml
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"]

1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ plugins:
spec: '@yarnpkg/plugin-typescript'

yarnPath: .yarn/releases/yarn-3.2.0.cjs
checksumBehavior: 'ignore'
Binary file removed apps/meteor/.snapcraft/launchpadkey.enc
Binary file not shown.
5 changes: 0 additions & 5 deletions apps/meteor/.snapcraft/resources/Caddyfile

This file was deleted.

40 changes: 0 additions & 40 deletions apps/meteor/.snapcraft/resources/backupdb

This file was deleted.

46 changes: 0 additions & 46 deletions apps/meteor/.snapcraft/resources/initcaddy

This file was deleted.

13 changes: 0 additions & 13 deletions apps/meteor/.snapcraft/resources/initreplset.js

This file was deleted.

34 changes: 0 additions & 34 deletions apps/meteor/.snapcraft/resources/prepareRocketChat

This file was deleted.

40 changes: 0 additions & 40 deletions apps/meteor/.snapcraft/resources/preparecaddy

This file was deleted.

22 changes: 0 additions & 22 deletions apps/meteor/.snapcraft/resources/preparemongo

This file was deleted.

23 changes: 0 additions & 23 deletions apps/meteor/.snapcraft/resources/preparenode

This file was deleted.

88 changes: 0 additions & 88 deletions apps/meteor/.snapcraft/resources/restoredb

This file was deleted.

Loading

0 comments on commit d17602f

Please sign in to comment.