Skip to content

Commit 4a3e631

Browse files
authored
Merge pull request #14297 from RocketChat/release-1.0.1
Release 1.0.1
2 parents 60f1a4a + fbfd7ec commit 4a3e631

File tree

14 files changed

+134
-15
lines changed

14 files changed

+134
-15
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 1.0.0
3+
ENV RC_VERSION 1.0.1
44

55
66

.github/history.json

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29886,6 +29886,89 @@
2988629886
]
2988729887
}
2988829888
]
29889+
},
29890+
"1.0.1": {
29891+
"node_version": "8.11.4",
29892+
"npm_version": "6.4.1",
29893+
"mongo_versions": [
29894+
"3.2",
29895+
"3.4",
29896+
"3.6",
29897+
"4.0"
29898+
],
29899+
"pull_requests": [
29900+
{
29901+
"pr": "14296",
29902+
"title": "[FIX] Popup cloud console in new window",
29903+
"userLogin": "geekgonecrazy",
29904+
"milestone": "1.0.1",
29905+
"contributors": [
29906+
"geekgonecrazy"
29907+
]
29908+
},
29909+
{
29910+
"pr": "14288",
29911+
"title": "[FIX] Switch oplog required doc link to more accurate link",
29912+
"userLogin": "geekgonecrazy",
29913+
"milestone": "1.0.1",
29914+
"contributors": [
29915+
"geekgonecrazy",
29916+
"web-flow"
29917+
]
29918+
},
29919+
{
29920+
"pr": "14291",
29921+
"title": "[FIX] Optional exit on Unhandled Promise Rejection",
29922+
"userLogin": "geekgonecrazy",
29923+
"milestone": "1.0.1",
29924+
"contributors": [
29925+
"geekgonecrazy",
29926+
"web-flow",
29927+
"rodrigok"
29928+
]
29929+
},
29930+
{
29931+
"pr": "14293",
29932+
"title": "[FIX] Error when accessing avatar with no token",
29933+
"userLogin": "geekgonecrazy",
29934+
"milestone": "1.0.1",
29935+
"contributors": [
29936+
"geekgonecrazy",
29937+
"rodrigok"
29938+
]
29939+
},
29940+
{
29941+
"pr": "14286",
29942+
"title": "[FIX] Startup error in registration check",
29943+
"userLogin": "geekgonecrazy",
29944+
"milestone": "1.0.1",
29945+
"contributors": [
29946+
"geekgonecrazy",
29947+
"web-flow"
29948+
]
29949+
},
29950+
{
29951+
"pr": "14290",
29952+
"title": "[FIX] Wrong header at Apps admin section",
29953+
"userLogin": "geekgonecrazy",
29954+
"milestone": "1.0.1",
29955+
"contributors": [
29956+
"geekgonecrazy",
29957+
"web-flow"
29958+
]
29959+
},
29960+
{
29961+
"pr": "14282",
29962+
"title": "[FIX] Error when accessing an invalid file upload url",
29963+
"userLogin": "wreiske",
29964+
"milestone": "1.0.1",
29965+
"contributors": [
29966+
"wreiske",
29967+
"d-gubert",
29968+
"web-flow"
29969+
]
29970+
}
29971+
]
2988929972
}
2989029973
}
2989129974
}

.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=1.0.0
20+
RC_VERSION=1.0.1
2121
fi
2222

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

HISTORY.md

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

2+
# 1.0.1
3+
`2019-04-28 · 7 🐛 · 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+
### 🐛 Bug fixes
11+
12+
- Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
13+
- Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
14+
- Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
15+
- Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
16+
- Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
17+
- Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
18+
- Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))
19+
20+
### 👩‍💻👨‍💻 Contributors 😍
21+
22+
- [@wreiske](https://github.com/wreiske)
23+
24+
### 👩‍💻👨‍💻 Core Team 🤓
25+
26+
- [@d-gubert](https://github.com/d-gubert)
27+
- [@geekgonecrazy](https://github.com/geekgonecrazy)
28+
- [@rodrigok](https://github.com/rodrigok)
29+
230
# 1.0.0
331
`2019-04-28 · 4 ️️️⚠️ · 30 🎉 · 32 🚀 · 97 🐛 · 173 🔍 · 60 👩‍💻👨‍💻`
432

app/apps/client/admin/apps.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template name="apps">
22
<section class="rc-apps-marketplace">
3-
{{#header sectionName="Marketplace" hideHelp=true fixedHeight=true fullpage=true}}
3+
{{#header sectionName="Apps" hideHelp=true fixedHeight=true fullpage=true}}
44
<div class="rc-header__section-button">
55
<button class="rc-button rc-button--small rc-button--primary" data-button="install_app">
66
{{> icon icon="cloud-plus" block="rc-icon--default-size"}} {{_ "Marketplace_view_marketplace"}}

app/cloud/client/admin/cloud.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="main-content-flex">
33
<section class="page-container page-home page-static page-settings">
44
{{#header sectionName="Connectivity_Services" hideHelp=true fixedHeight=true fullpage=true}}
5-
<button type="button" class="rc-button rc-button--primary action cloud-console-btn">{{_ "Cloud_console"}}</button>
5+
<a href="https://cloud.rocket.chat" class="rc-button rc-button--primary action cloud-console-btn" target="_blank">{{_ "Cloud_console"}}</a>
66
{{/header}}
77
<div class="content">
88
{{#requiresPermission 'manage-cloud'}}

app/cloud/client/admin/cloud.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,6 @@ Template.cloud.events({
211211
'click .sync-btn'(e, i) {
212212
i.syncWorkspace();
213213
},
214-
215-
'click .cloud-console-btn'() {
216-
window.location.href = 'https://cloud.rocket.chat';
217-
},
218214
});
219215

220216
Template.cloud.onRendered(() => {

app/cloud/server/functions/retrieveRegistrationStatus.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function retrieveRegistrationStatus() {
1212
};
1313

1414
const firstUser = Users.getOldest({ emails: 1 });
15-
info.email = firstUser && firstUser.emails[0].address;
15+
info.email = firstUser && firstUser.emails && firstUser.emails[0].address;
1616

1717
if (settings.get('Organization_Email')) {
1818
info.email = settings.get('Organization_Email');

app/file-upload/server/lib/requests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WebApp.connectHandlers.use('/file-upload/', function(req, res, next) {
66

77
const match = /^\/([^\/]+)\/(.*)/.exec(req.url);
88

9-
if (match[1]) {
9+
if (match && match[1]) {
1010
const file = Uploads.findOneById(match[1]);
1111

1212
if (file) {

app/lib/server/lib/meteorFixes.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,15 @@ Meteor.setInterval(() => {
6060
*/
6161

6262
process.on('unhandledRejection', (error) => {
63+
console.error('=== UnHandledPromiseRejection ===');
6364
console.error(error);
64-
console.error('Exiting due to an unhandled promise rejection');
65-
process.exit(1);
65+
console.error('---------------------------------');
66+
console.error('Errors like this can cause oplog processing errors.');
67+
console.error('Setting EXIT_UNHANDLEDPROMISEREJECTION will cause the process to exit allowing your service to automatically restart the process');
68+
console.error('Future node.js versions will automatically exit the process');
69+
console.error('=================================');
70+
71+
if (process.env.NODE_ENV === 'development' || process.env.EXIT_UNHANDLEDPROMISEREJECTION) {
72+
process.exit(1);
73+
}
6674
});

0 commit comments

Comments
 (0)