Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new/…
Browse files Browse the repository at this point in the history
…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
gabriellsh committed Jun 8, 2022
2 parents 9743326 + 9629831 commit 083bb4f
Show file tree
Hide file tree
Showing 109 changed files with 2,301 additions and 2,622 deletions.
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 083bb4f

Please sign in to comment.