Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.1 #14297

Merged
merged 8 commits into from
Apr 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/rhscl/nodejs-8-rhel7

ENV RC_VERSION 1.0.0
ENV RC_VERSION 1.0.1

MAINTAINER buildmaster@rocket.chat

Expand Down
83 changes: 83 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -29886,6 +29886,89 @@
]
}
]
},
"1.0.1": {
"node_version": "8.11.4",
"npm_version": "6.4.1",
"mongo_versions": [
"3.2",
"3.4",
"3.6",
"4.0"
],
"pull_requests": [
{
"pr": "14296",
"title": "[FIX] Popup cloud console in new window",
"userLogin": "geekgonecrazy",
"milestone": "1.0.1",
"contributors": [
"geekgonecrazy"
]
},
{
"pr": "14288",
"title": "[FIX] Switch oplog required doc link to more accurate link",
"userLogin": "geekgonecrazy",
"milestone": "1.0.1",
"contributors": [
"geekgonecrazy",
"web-flow"
]
},
{
"pr": "14291",
"title": "[FIX] Optional exit on Unhandled Promise Rejection",
"userLogin": "geekgonecrazy",
"milestone": "1.0.1",
"contributors": [
"geekgonecrazy",
"web-flow",
"rodrigok"
]
},
{
"pr": "14293",
"title": "[FIX] Error when accessing avatar with no token",
"userLogin": "geekgonecrazy",
"milestone": "1.0.1",
"contributors": [
"geekgonecrazy",
"rodrigok"
]
},
{
"pr": "14286",
"title": "[FIX] Startup error in registration check",
"userLogin": "geekgonecrazy",
"milestone": "1.0.1",
"contributors": [
"geekgonecrazy",
"web-flow"
]
},
{
"pr": "14290",
"title": "[FIX] Wrong header at Apps admin section",
"userLogin": "geekgonecrazy",
"milestone": "1.0.1",
"contributors": [
"geekgonecrazy",
"web-flow"
]
},
{
"pr": "14282",
"title": "[FIX] Error when accessing an invalid file upload url",
"userLogin": "wreiske",
"milestone": "1.0.1",
"contributors": [
"wreiske",
"d-gubert",
"web-flow"
]
}
]
}
}
}
2 changes: 1 addition & 1 deletion .travis/snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
RC_VERSION=$TRAVIS_TAG
else
CHANNEL=edge
RC_VERSION=1.0.0
RC_VERSION=1.0.1
fi

echo "Preparing to trigger a snap release for $CHANNEL channel"
Expand Down
28 changes: 28 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@

# 1.0.1
`2019-04-28 · 7 🐛 · 4 👩‍💻👨‍💻`

### Engine versions
- Node: `8.11.4`
- NPM: `6.4.1`
- MongoDB: `3.2, 3.4, 3.6, 4.0`

### 🐛 Bug fixes

- Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
- Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
- Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
- Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
- Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
- Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
- Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))

### 👩‍💻👨‍💻 Contributors 😍

- [@wreiske](https://github.com/wreiske)

### 👩‍💻👨‍💻 Core Team 🤓

- [@d-gubert](https://github.com/d-gubert)
- [@geekgonecrazy](https://github.com/geekgonecrazy)
- [@rodrigok](https://github.com/rodrigok)

# 1.0.0
`2019-04-28 · 4 ️️️⚠️ · 30 🎉 · 32 🚀 · 97 🐛 · 173 🔍 · 60 👩‍💻👨‍💻`

Expand Down
2 changes: 1 addition & 1 deletion app/apps/client/admin/apps.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template name="apps">
<section class="rc-apps-marketplace">
{{#header sectionName="Marketplace" hideHelp=true fixedHeight=true fullpage=true}}
{{#header sectionName="Apps" hideHelp=true fixedHeight=true fullpage=true}}
<div class="rc-header__section-button">
<button class="rc-button rc-button--small rc-button--primary" data-button="install_app">
{{> icon icon="cloud-plus" block="rc-icon--default-size"}} {{_ "Marketplace_view_marketplace"}}
Expand Down
2 changes: 1 addition & 1 deletion app/cloud/client/admin/cloud.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="main-content-flex">
<section class="page-container page-home page-static page-settings">
{{#header sectionName="Connectivity_Services" hideHelp=true fixedHeight=true fullpage=true}}
<button type="button" class="rc-button rc-button--primary action cloud-console-btn">{{_ "Cloud_console"}}</button>
<a href="https://cloud.rocket.chat" class="rc-button rc-button--primary action cloud-console-btn" target="_blank">{{_ "Cloud_console"}}</a>
{{/header}}
<div class="content">
{{#requiresPermission 'manage-cloud'}}
Expand Down
4 changes: 0 additions & 4 deletions app/cloud/client/admin/cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,6 @@ Template.cloud.events({
'click .sync-btn'(e, i) {
i.syncWorkspace();
},

'click .cloud-console-btn'() {
window.location.href = 'https://cloud.rocket.chat';
},
});

Template.cloud.onRendered(() => {
Expand Down
2 changes: 1 addition & 1 deletion app/cloud/server/functions/retrieveRegistrationStatus.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function retrieveRegistrationStatus() {
};

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

if (settings.get('Organization_Email')) {
info.email = settings.get('Organization_Email');
Expand Down
2 changes: 1 addition & 1 deletion app/file-upload/server/lib/requests.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WebApp.connectHandlers.use('/file-upload/', function(req, res, next) {

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

if (match[1]) {
if (match && match[1]) {
const file = Uploads.findOneById(match[1]);

if (file) {
Expand Down
12 changes: 10 additions & 2 deletions app/lib/server/lib/meteorFixes.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,15 @@ Meteor.setInterval(() => {
*/

process.on('unhandledRejection', (error) => {
console.error('=== UnHandledPromiseRejection ===');
console.error(error);
console.error('Exiting due to an unhandled promise rejection');
process.exit(1);
console.error('---------------------------------');
console.error('Errors like this can cause oplog processing errors.');
console.error('Setting EXIT_UNHANDLEDPROMISEREJECTION will cause the process to exit allowing your service to automatically restart the process');
console.error('Future node.js versions will automatically exit the process');
console.error('=================================');

if (process.env.NODE_ENV === 'development' || process.env.EXIT_UNHANDLEDPROMISEREJECTION) {
process.exit(1);
}
});
2 changes: 1 addition & 1 deletion app/utils/rocketchat.info
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.0.0"
"version": "1.0.1"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
"version": "1.0.0",
"version": "1.0.1",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
Expand Down
4 changes: 4 additions & 0 deletions server/routes/avatar/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ function isUserAuthenticated({ headers, query }) {
rc_token = cookie.get('rc_token', headers.cookie);
}

if (rc_uid == null || rc_token == null) {
return false;
}

const userFound = Users.findOneByIdAndLoginToken(rc_uid, rc_token, { fields: { _id: 1 } });

return !!rc_uid && !!rc_token && !!userFound;
Expand Down
2 changes: 1 addition & 1 deletion server/startup/serverRunning.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Meteor.startup(function() {
msg = msg.join('\n');

if (!isOplogEnabled) {
msg += ['', '', 'OPLOG / REPLICASET IS REQUIRED TO RUN ROCKET.CHAT, MORE INFORMATION AT:', 'https://rocket.chat/docs/installation/docker-containers/high-availability-install'].join('\n');
msg += ['', '', 'OPLOG / REPLICASET IS REQUIRED TO RUN ROCKET.CHAT, MORE INFORMATION AT:', 'https://go.rocket.chat/i/oplog-required'].join('\n');
SystemLogger.error_box(msg, 'SERVER ERROR');

return process.exit(1);
Expand Down