Skip to content

Commit

Permalink
Merge pull request RocketChat#21437 from RocketChat/release-3.13.0
Browse files Browse the repository at this point in the history
Release 3.13.0
  • Loading branch information
sampaiodiego authored Apr 5, 2021
2 parents fe768b8 + 7e5bc8e commit 0b789f7
Show file tree
Hide file tree
Showing 397 changed files with 16,609 additions and 1,910 deletions.
2 changes: 1 addition & 1 deletion .docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.18.4-buster-slim
FROM node:12.21.0-buster-slim

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.18.4-buster-slim
FROM node:12.21.0-buster-slim

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 3.12.3
ENV RC_VERSION 3.13.0

MAINTAINER [email protected]

Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For a improvement (performance or little improvements) in existent features
[FIX] For bug fixes that affects the end user
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
Expand Down
1,396 changes: 1,353 additions & 43 deletions .github/history.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
echo "github.event_name: ${{ github.event_name }}"
cat $GITHUB_EVENT_PATH
- name: Use Node.js 12.18.4
- name: Use Node.js 12.21.0
uses: actions/setup-node@v2
with:
node-version: "12.18.4"
node-version: "12.21.0"

- uses: actions/checkout@v2

Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:

strategy:
matrix:
node-version: ["12.18.4"]
node-version: ["12.21.0"]
mongodb-version: ["3.4", "3.6", "4.0"]

steps:
Expand Down Expand Up @@ -312,10 +312,10 @@ jobs:
path: ~/.meteor
key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}

- name: Use Node.js 12.18.4
- name: Use Node.js 12.21.0
uses: actions/setup-node@v2
with:
node-version: "12.18.4"
node-version: "12.21.0"

- name: Install Meteor
run: |
Expand Down Expand Up @@ -542,10 +542,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.18.4
- name: Use Node.js 12.21.0
uses: actions/setup-node@v2
with:
node-version: "12.18.4"
node-version: "12.21.0"

- name: Login to DockerHub
uses: docker/login-action@v1
Expand Down
28 changes: 13 additions & 15 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,28 @@ [email protected]
[email protected]
[email protected]
[email protected]
accounts-password@1.6.2
accounts-password@1.7.0
[email protected]
blaze-html-templates
[email protected]
[email protected]
[email protected]
dynamic-import@0.5.2
ecmascript@0.14.3
typescript@3.7.6
dynamic-import@0.6.0
ecmascript@0.15.0
typescript@4.1.2
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]
Expand All @@ -47,7 +46,6 @@ rocketchat:version
konecty:multiple-instances-status
konecty:user-presence

deepwell:bootstrap-datepicker2
dispatch:run-as-user
jalik:[email protected]
jalik:[email protected]
Expand All @@ -70,22 +68,22 @@ littledata:synced-cron

edgee:slingshot
jalik:[email protected]
accounts-base@1.7.0
accounts-base@1.8.0
[email protected]
autoupdate@1.6.0
babel-compiler@7.5.3
autoupdate@1.7.0
babel-compiler@7.6.0
[email protected]
htmljs
less
matb33:collection-hooks
meteorhacks:inject-initial
[email protected].0
[email protected].2
[email protected]
[email protected]
[email protected]
templating
webapp@1.9.1
webapp-hashing@1.0.9
webapp@1.10.0
webapp-hashing@1.1.0
rocketchat:oauth2-server
rocketchat:i18n
rocketchat:postcss
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.11.1
METEOR@2.1
44 changes: 22 additions & 22 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
accounts-base@1.7.0
accounts-base@1.8.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
accounts-password@1.6.2
accounts-password@1.7.0
[email protected]
aldeed:[email protected]
[email protected]
autoupdate@1.6.0
babel-compiler@7.5.3
autoupdate@1.7.0
babel-compiler@7.6.0
[email protected]
[email protected]
[email protected]
Expand All @@ -25,24 +25,23 @@ [email protected]
[email protected]
dandv:[email protected]
[email protected]
ddp-client@2.3.3
ddp-client@2.4.0
[email protected]
[email protected]
[email protected]
deepwell:[email protected]
[email protected]
[email protected]
dispatch:[email protected]
dynamic-import@0.5.2
ecmascript@0.14.3
dynamic-import@0.6.0
ecmascript@0.15.0
[email protected]
[email protected]
[email protected]
edgee:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].4
[email protected]
[email protected]
[email protected]
Expand All @@ -52,7 +51,7 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
jalik:[email protected]
Expand All @@ -71,25 +70,25 @@ [email protected]
littledata:[email protected]
[email protected]
[email protected]
logging@1.1.20
logging@1.2.0
matb33:[email protected]
mdg:[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].3
meteorhacks:[email protected]
meteorspark:[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
mizzao:[email protected]
[email protected]
[email protected]
[email protected]
modules@0.15.0
modules@0.16.0
[email protected]
[email protected].0
[email protected].1
[email protected].1
[email protected].2
[email protected]
[email protected]
mrt:[email protected]
Expand All @@ -98,12 +97,12 @@ nimble:[email protected]
nooitaf:[email protected]_1
[email protected]
[email protected]
[email protected].0
[email protected].2
[email protected]
[email protected]
[email protected]
[email protected]
ostrio:cookies@2.6.0
ostrio:cookies@2.7.0
pauli:[email protected]
pauli:[email protected]
[email protected]
Expand All @@ -112,9 +111,10 @@ raix:[email protected]
raix:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand All @@ -141,9 +141,9 @@ [email protected]
[email protected]
[email protected]
[email protected]
typescript@3.7.6
typescript@4.1.2
[email protected]
[email protected]
[email protected]
webapp@1.9.1
webapp-hashing@1.0.9
webapp@1.10.0
webapp-hashing@1.1.0
2 changes: 1 addition & 1 deletion .snapcraft/resources/prepareRocketChat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

curl -SLf "https://releases.rocket.chat/3.12.3/download/" -o rocket.chat.tgz
curl -SLf "https://releases.rocket.chat/3.13.0/download/" -o rocket.chat.tgz

tar xf rocket.chat.tgz --strip 1

Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/resources/preparenode
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

node_version="v12.18.4"
node_version="v12.21.0"

unamem="$(uname -m)"
if [[ $unamem == *aarch64* ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# 5. `snapcraft snap`

name: rocketchat-server
version: 3.12.3
version: 3.13.0
summary: Rocket.Chat server
description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
confinement: strict
Expand Down
Loading

0 comments on commit 0b789f7

Please sign in to comment.