Skip to content

Commit f598d33

Browse files
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into new/teams-room-creation-permissions
2 parents 7ba91bc + 2c0260d commit f598d33

File tree

1,086 files changed

+20077
-8729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,086 files changed

+20077
-8729
lines changed

.changeset/angry-llamas-retire.md

+5

.changeset/attachment-collapse.md

+5

.changeset/beige-deers-laugh.md

+5

.changeset/big-teachers-change.md

+6

.changeset/blue-tomatoes-retire.md

+8

.changeset/calm-carrots-judge.md

+12

.changeset/clean-melons-return.md

+5

.changeset/clever-parrots-count.md

+5

.changeset/cyan-balloons-unite.md

+5

.changeset/cyan-penguins-listen.md

+5

.changeset/empty-tables-deliver.md

+5

.changeset/forty-dragons-juggle.md

+5

.changeset/four-eels-compete.md

+8

.changeset/fresh-maps-rhyme.md

+5

.changeset/friendly-cycles-grab.md

+7

.changeset/funny-buses-own.md

+5

.changeset/green-timers-cross.md

+5

.changeset/green-tools-exercise.md

+5

.changeset/grumpy-eagles-roll.md

+5

.changeset/grumpy-trainers-hope.md

+5

.changeset/honest-gorillas-reply.md

+5

.changeset/itchy-zoos-appear.md

+5

.changeset/kind-melons-try.md

+6

.changeset/little-planes-wonder.md

+7

.changeset/lucky-bikes-enjoy.md

+7

.changeset/many-dolphins-deny.md

+5

.changeset/message-composer-hint.md

+6

.changeset/mighty-shirts-sell.md

+5

.changeset/nice-points-notice.md

+5

.changeset/rare-eels-fetch.md

+8

.changeset/rude-spoons-pump.md

+5

.changeset/selfish-rice-wave.md

+6

.changeset/seven-pugs-argue.md

+5

.changeset/sixty-bananas-sit.md

+6

.changeset/smooth-kangaroos-mate.md

+5

.changeset/spotty-tips-sell.md

+5

.changeset/stale-monkeys-yell.md

+5

.changeset/strong-countries-dance.md

+6

.changeset/swift-beans-reflect.md

+5

.changeset/tender-lizards-shop.md

+5

.changeset/tiny-onions-remember.md

+7

.changeset/tough-candles-argue.md

+5

.changeset/wet-crabs-brush.md

+5

.changeset/wicked-pumpkins-walk.md

+5

.changeset/witty-dogs-share.md

+5

.changeset/witty-pumas-pretend.md

+5

.changeset/yellow-brooms-brake.md

+5

.github/workflows/ci-test-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
path: |
161161
~/.cache/ms-playwright
162162
# This is the version of Playwright that we are using, if you are willing to upgrade, you should update this.
163-
key: playwright-1.37.1
163+
key: playwright-1.40.1
164164

165165
- name: Install Playwright
166166
if: inputs.type == 'ui' && steps.cache-playwright.outputs.cache-hit != 'true'

.github/workflows/ci.yml

-15
Original file line numberDiff line numberDiff line change
@@ -724,21 +724,6 @@ jobs:
724724
# Makes build fail if the release isn't there
725725
curl --fail https://releases.rocket.chat/$RC_VERSION/info
726726
727-
- name: RedHat Registry
728-
if: github.event_name == 'release'
729-
env:
730-
REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
731-
REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
732-
run: |
733-
GIT_TAG="${GITHUB_REF#*tags/}"
734-
735-
curl -X POST \
736-
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
737-
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
738-
-H 'Cache-Control: no-cache' \
739-
-H 'Content-Type: application/json' \
740-
-d '{"tag":"'$GIT_TAG'"}'
741-
742727
trigger-dependent-workflows:
743728
runs-on: ubuntu-latest
744729
if: github.event_name == 'release'

.gitpod.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
tasks:
2+
- init: |
3+
nvm install $(jq -r .engines.node package.json) &&
4+
curl https://install.meteor.com/ | sh &&
5+
export PATH="$PATH:$HOME/.meteor" &&
6+
yarn &&
7+
export ROOT_URL=$(gp url 3000)
8+
command: yarn build && yarn dev
9+
10+
ports:
11+
- port: 3000
12+
visibility: public
13+
onOpen: open-preview
14+
15+
github:
16+
prebuilds:
17+
master: true
18+
pullRequests: true
19+
pullRequestsFromForks: true
20+
addCheck: true
21+
addComment: true
22+
addBadge: true
23+
24+
vscode:
25+
extensions:
26+
- esbenp.prettier-vscode

.kodiak.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ version = 1
55
method = "squash"
66
automerge_label = ["stat: ready to merge", "automerge"]
77
block_on_neutral_required_check_runs = true
8-
blocking_labels = ["stat: needs QA", "Invalid PR Title"]
8+
blocking_labels = ["stat: needs QA", "Invalid PR Title", "do not merge"]
99
prioritize_ready_to_merge = true
10-
merge.do_not_merge=true
1110

1211
[merge.message]
1312
title = "pull_request_title"

README.md

+8

0 commit comments

Comments
 (0)