diff --git a/app.js b/app.js
index 9d706f9389..b40ec938a4 100644
--- a/app.js
+++ b/app.js
@@ -118,7 +118,7 @@ function start() {
var urlObject = url.parse(nconf.get('url'));
var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
nconf.set('base_url', urlObject.protocol + '//' + urlObject.host);
- nconf.set('secure', urlObject.protocol === 'https');
+ nconf.set('secure', urlObject.protocol === 'https:');
nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', relativePath);
nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
@@ -181,7 +181,11 @@ function start() {
require('./src/meta').configs.init(next);
},
function(next) {
- require('./src/meta').dependencies.check(next);
+ if (nconf.get('dep-check') === undefined || nconf.get('dep-check') !== false) {
+ require('./src/meta').dependencies.check(next);
+ } else {
+ setImmediate(next);
+ }
},
function(next) {
require('./src/upgrade').check(next);
diff --git a/package.json b/package.json
index 3eac464ca1..0f8f235208 100644
--- a/package.json
+++ b/package.json
@@ -51,9 +51,9 @@
"nodebb-plugin-composer-default": "4.0.2",
"nodebb-plugin-dbsearch": "1.0.1",
"nodebb-plugin-emoji-extended": "1.1.0",
- "nodebb-plugin-emoji-one": "1.1.3",
+ "nodebb-plugin-emoji-one": "1.1.4",
"nodebb-plugin-markdown": "5.1.5",
- "nodebb-plugin-mentions": "1.1.1",
+ "nodebb-plugin-mentions": "1.1.2",
"nodebb-plugin-soundpack-default": "0.1.6",
"nodebb-plugin-spam-be-gone": "0.4.6",
"nodebb-rewards-essentials": "0.0.8",
@@ -118,4 +118,4 @@
"url": "https://github.com/barisusakli"
}
]
-}
\ No newline at end of file
+}
diff --git a/public/503.html b/public/503.html
index 124e92ef26..8907525ec4 100644
--- a/public/503.html
+++ b/public/503.html
@@ -2,6 +2,7 @@
Excessive Load Warning
+