Skip to content

Commit 5fb5e57

Browse files
sampaiodiegosampaiodiego
authored
Merge pull request #13364 from RocketChat/release-0.74.2
Release 0.74.2
2 parents 47a7463 + 0130d2e commit 5fb5e57

File tree

14 files changed

+145
-18
lines changed

14 files changed

+145
-18
lines changed

‎.docker/Dockerfile.rhel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
22

3-
ENV RC_VERSION 0.74.1
3+
ENV RC_VERSION 0.74.2
44

55
MAINTAINER [email protected]
66

‎.github/history.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25573,6 +25573,54 @@
2557325573
]
2557425574
}
2557525575
]
25576+
},
25577+
"0.74.2": {
25578+
"node_version": "8.11.4",
25579+
"npm_version": "6.4.1",
25580+
"mongo_versions": [
25581+
"3.2",
25582+
"3.4",
25583+
"3.6",
25584+
"4.0"
25585+
],
25586+
"pull_requests": [
25587+
{
25588+
"pr": "13326",
25589+
"title": "[FIX] Rate Limiter was limiting communication between instances",
25590+
"userLogin": "rodrigok",
25591+
"milestone": "0.74.2",
25592+
"contributors": [
25593+
"rodrigok"
25594+
]
25595+
},
25596+
{
25597+
"pr": "13349",
25598+
"title": "[FIX] Setup wizard calling 'saveSetting' for each field/setting",
25599+
"userLogin": "ggazzo",
25600+
"milestone": "0.74.2",
25601+
"contributors": [
25602+
"ggazzo"
25603+
]
25604+
},
25605+
{
25606+
"pr": "13342",
25607+
"title": "[IMPROVE] Send `uniqueID` to all clients so Jitsi rooms can be created correctly",
25608+
"userLogin": "sampaiodiego",
25609+
"milestone": "0.74.2",
25610+
"contributors": [
25611+
"sampaiodiego"
25612+
]
25613+
},
25614+
{
25615+
"pr": "13350",
25616+
"title": "[FIX] Pass token for cloud register",
25617+
"userLogin": "geekgonecrazy",
25618+
"milestone": "0.74.2",
25619+
"contributors": [
25620+
"geekgonecrazy"
25621+
]
25622+
}
25623+
]
2557625624
}
2557725625
}
2557825626
}

‎.sandstorm/sandstorm-pkgdef.capnp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
1919

2020
appTitle = (defaultText = "Rocket.Chat"),
2121

22-
appVersion = 127, # Increment this for every release.
22+
appVersion = 128, # Increment this for every release.
2323

24-
appMarketingVersion = (defaultText = "0.74.1"),
24+
appMarketingVersion = (defaultText = "0.74.2"),
2525
# Human-readable representation of appVersion. Should match the way you
2626
# identify versions of your app in documentation and marketing.
2727

‎.travis/snap.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
1717
RC_VERSION=$TRAVIS_TAG
1818
else
1919
CHANNEL=edge
20-
RC_VERSION=0.74.1
20+
RC_VERSION=0.74.2
2121
fi
2222

2323
echo "Preparing to trigger a snap release for $CHANNEL channel"

‎HISTORY.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
11

2+
# 0.74.2
3+
`2019-02-05 · 1 🚀 · 3 🐛 · 4 👩‍💻👨‍💻`
4+
5+
### Engine versions
6+
- Node: `8.11.4`
7+
- NPM: `6.4.1`
8+
- MongoDB: `3.2, 3.4, 3.6, 4.0`
9+
10+
### 🚀 Improvements
11+
12+
- Send `uniqueID` to all clients so Jitsi rooms can be created correctly ([#13342](https://github.com/RocketChat/Rocket.Chat/pull/13342))
13+
14+
### 🐛 Bug fixes
15+
16+
- Rate Limiter was limiting communication between instances ([#13326](https://github.com/RocketChat/Rocket.Chat/pull/13326))
17+
- Setup wizard calling 'saveSetting' for each field/setting ([#13349](https://github.com/RocketChat/Rocket.Chat/pull/13349))
18+
- Pass token for cloud register ([#13350](https://github.com/RocketChat/Rocket.Chat/pull/13350))
19+
20+
### 👩‍💻👨‍💻 Core Team 🤓
21+
22+
- [@geekgonecrazy](https://github.com/geekgonecrazy)
23+
- [@ggazzo](https://github.com/ggazzo)
24+
- [@rodrigok](https://github.com/rodrigok)
25+
- [@sampaiodiego](https://github.com/sampaiodiego)
26+
227
# 0.74.1
328
`2019-02-01 · 4 🎉 · 7 🐛 · 1 🔍 · 8 👩‍💻👨‍💻`
429

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Rocket.Chat",
33
"description": "The Ultimate Open Source WebChat Platform",
4-
"version": "0.74.1",
4+
"version": "0.74.2",
55
"author": {
66
"name": "Rocket.Chat",
77
"url": "https://rocket.chat/"

‎packages/rocketchat-cloud/client/admin/cloud.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Template.cloud.onCreated(function() {
4848
const params = queryString.parse(location.search);
4949

5050
if (params.token) {
51-
instance.connectWorkspace();
51+
instance.connectWorkspace(params.token);
5252
} else {
5353
instance.loadRegStatus();
5454
}

‎packages/rocketchat-lib/package.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ Package.onUse(function(api) {
203203
api.addFiles('server/methods/restartServer.js', 'server');
204204
api.addFiles('server/methods/robotMethods.js', 'server');
205205
api.addFiles('server/methods/saveSetting.js', 'server');
206+
api.addFiles('server/methods/saveSettings.js', 'server');
206207
api.addFiles('server/methods/sendInvitationEmail.js', 'server');
207208
api.addFiles('server/methods/sendMessage.js', 'server');
208209
api.addFiles('server/methods/sendSMTPTestEmail.js', 'server');

‎packages/rocketchat-lib/server/lib/debug.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const wrapMethods = function(name, originalHandler, methodsMap) {
5050
methodsMap[name] = function(...originalArgs) {
5151
traceConnection(Log_Trace_Methods, Log_Trace_Methods_Filter, 'method', name, this.connection, this.userId);
5252
const end = RocketChat.metrics.meteorMethods.startTimer({
53-
method: name,
53+
method: name === 'stream' ? `${ name }:${ originalArgs[0] }` : name,
5454
has_connection: this.connection != null,
5555
has_user: this.userId != null,
5656
});

‎packages/rocketchat-lib/server/methods/saveSettings.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import { Meteor } from 'meteor/meteor';
2+
import { Match, check } from 'meteor/check';
3+
4+
Meteor.methods({
5+
saveSettings(params = []) {
6+
if (Meteor.userId() === null) {
7+
throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
8+
method: 'saveSetting',
9+
});
10+
}
11+
12+
if (!RocketChat.authz.hasPermission(Meteor.userId(), 'edit-privileged-setting')) {
13+
throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
14+
method: 'saveSetting',
15+
});
16+
}
17+
params.forEach(({ _id, value, editor }) => {
18+
// Verify the _id passed in is a string.
19+
check(_id, String);
20+
21+
const setting = RocketChat.models.Settings.db.findOneById(_id);
22+
23+
// Verify the value is what it should be
24+
switch (setting.type) {
25+
case 'roomPick':
26+
check(value, Match.OneOf([Object], ''));
27+
break;
28+
case 'boolean':
29+
check(value, Boolean);
30+
break;
31+
case 'int':
32+
check(value, Number);
33+
break;
34+
default:
35+
check(value, String);
36+
break;
37+
}
38+
RocketChat.settings.updateById(_id, value, editor);
39+
});
40+
return true;
41+
},
42+
});

0 commit comments

Comments
 (0)