import Planka upstream
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
diff --git a/node_modules/sails/lib/hooks/i18n/index.js b/node_modules/sails/lib/hooks/i18n/index.js
|
||||
index a0c74ed..582ff66 100644
|
||||
--- a/node_modules/sails/lib/hooks/i18n/index.js
|
||||
+++ b/node_modules/sails/lib/hooks/i18n/index.js
|
||||
@@ -108,7 +108,8 @@ module.exports = function(sails) {
|
||||
locales: sails.config.i18n.locales,
|
||||
defaultLocale: sails.config.i18n.defaultLocale,
|
||||
directory: resolvedLocalesDirectory,
|
||||
- extension: I18N_LOCALES_FILE_EXTENSION
|
||||
+ extension: I18N_LOCALES_FILE_EXTENSION,
|
||||
+ devMode: false
|
||||
});
|
||||
|
||||
// Add all of the i18n prototype methods into this hook.
|
||||
@@ -176,7 +177,8 @@ module.exports = function(sails) {
|
||||
defaultLocale: sails.config.i18n.defaultLocale,
|
||||
directory: resolvedLocalesDirectory,
|
||||
extension: I18N_LOCALES_FILE_EXTENSION,
|
||||
- request: req
|
||||
+ request: req,
|
||||
+ devMode: false
|
||||
});
|
||||
|
||||
// Mix translation capabilities into res.locals.
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/node_modules/skipper-disk/standalone/build-progress-stream.js b/node_modules/skipper-disk/standalone/build-progress-stream.js
|
||||
index ed048dc..3cca22e 100644
|
||||
--- a/node_modules/skipper-disk/standalone/build-progress-stream.js
|
||||
+++ b/node_modules/skipper-disk/standalone/build-progress-stream.js
|
||||
@@ -110,7 +110,7 @@ module.exports = function buildProgressStream (options, __newFile, receiver__, o
|
||||
receiver__.emit('progress', currentFileProgress);
|
||||
|
||||
// and then enforce its `maxBytes`.
|
||||
- if (options.maxBytes && totalBytesWritten >= options.maxBytes) {
|
||||
+ if (!_.isNull(options.maxBytes) && totalBytesWritten >= options.maxBytes) {
|
||||
|
||||
var err = new Error();
|
||||
err.code = 'E_EXCEEDS_UPLOAD_LIMIT';
|
||||
@@ -0,0 +1,22 @@
|
||||
diff --git a/node_modules/waterline/lib/waterline/utils/query/forge-adapter-error.js b/node_modules/waterline/lib/waterline/utils/query/forge-adapter-error.js
|
||||
index 3d4a77f..07d09ad 100644
|
||||
--- a/node_modules/waterline/lib/waterline/utils/query/forge-adapter-error.js
|
||||
+++ b/node_modules/waterline/lib/waterline/utils/query/forge-adapter-error.js
|
||||
@@ -223,7 +223,7 @@ module.exports = function forgeAdapterError(err, omen, adapterMethodName, modelI
|
||||
|
||||
|
||||
// If there were any unmatched keys, log a warning and silently ignore them.
|
||||
- if (unmatchedKeys.length > 0) {
|
||||
+ /* if (unmatchedKeys.length > 0) {
|
||||
console.warn('\n'+
|
||||
'Warning: Adapter sent back a uniqueness error, but that error references key(s) ('+unmatchedKeys+') which cannot\n'+
|
||||
'be matched up with the column names of any attributes in this model (`'+modelIdentity+'`). This probably\n'+
|
||||
@@ -232,7 +232,7 @@ module.exports = function forgeAdapterError(err, omen, adapterMethodName, modelI
|
||||
'in uniqueness errors, then just use an empty array for the `keys` property of this error.)\n'+
|
||||
'(Proceeding anyway as if these keys weren\'t included...)\n'
|
||||
);
|
||||
- }//>-
|
||||
+ } */ //>-
|
||||
|
||||
|
||||
// Build the customizations for our uniqueness error.
|
||||
Reference in New Issue
Block a user