Merge branch 'master' of https://github.com/NodeBB/NodeBB

Dockerfile

@@ -1,5 +1,5 @@
 # The base image is the latest 8.x node (LTS)
-FROM node:8.15.1@sha256:c151597d05a3c8c4e7b2e988f71c8cd645235d96f39a47b16b1930ef9e7a5aab
+FROM node:8.15.1@sha256:918f0be3932f555cd2645ca828b9c231a2dab10d9cf2dbb58896411207bbe52f
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

install/package.json

@@ -62,7 +62,7 @@
         "express-useragent": "^1.0.12",
         "graceful-fs": "^4.1.11",
         "helmet": "^3.11.0",
-        "html-to-text": "^4.0.0",
+        "html-to-text": "^5.0.0",
         "ipaddr.js": "^1.5.4",
         "jquery": "^3.2.1",
         "jsesc": "2.5.2",
@@ -108,7 +108,7 @@
         "rimraf": "2.6.3",
         "rss": "^1.2.2",
         "sanitize-html": "^1.16.3",
-        "semver": "^5.4.1",
+        "semver": "^6.0.0",
         "serve-favicon": "^2.4.5",
         "sharp": "0.22.0",
         "sitemap": "^2.0.0",
@@ -119,7 +119,7 @@
         "socket.io-client": "2.2.0",
         "socket.io-redis": "5.2.0",
         "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^5.0.0",
+        "spdx-license-list": "^6.0.0",
         "spider-detector": "1.0.19",
         "textcomplete": "^0.17.1",
         "textcomplete.contenteditable": "^0.1.1",

src/controllers/composer.js

@@ -9,6 +9,12 @@ var topics = require('../topics');
 var helpers = require('./helpers');
 
 exports.get = function (req, res, callback) {
+	res.locals.metaTags = {
+		...res.locals.metaTags,
+		name: 'robots',
+		content: 'noindex',
+	};
+
 	async.waterfall([
 		function (next) {
 			plugins.fireHook('filter:composer.build', {

src/controllers/index.js

@@ -40,6 +40,12 @@ Controllers.errors = require('./errors');
 Controllers.composer = require('./composer');
 
 Controllers.reset = function (req, res, next) {
+	res.locals.metaTags = {
+		...res.locals.metaTags,
+		name: 'robots',
+		content: 'noindex',
+	};
+
 	const renderReset = function (code, valid) {
 		res.render('reset_code', {
 			valid: valid,

src/posts/uploads.js

@@ -58,7 +58,7 @@ module.exports = function (Posts) {
 
 	Posts.uploads.listWithSizes = async function (pid) {
 		const paths = await Posts.async.uploads.list(pid);
-		const sizes = await db.async.getObjects(paths.map(path => 'upload:' + md5(path)));
+		const sizes = await db.async.getObjects(paths.map(path => 'upload:' + md5(path))) || {};
 
 		return sizes.map((sizeObj, idx) => {
 			sizeObj.name = paths[idx];