diff --git a/.nsprc b/.nsprc
index 530a17a9f..8962db719 100644
--- a/.nsprc
+++ b/.nsprc
@@ -7,6 +7,7 @@
"https://nodesecurity.io/advisories/594",
"https://nodesecurity.io/advisories/603",
"https://nodesecurity.io/advisories/611",
- "https://nodesecurity.io/advisories/612"
+ "https://nodesecurity.io/advisories/612",
+ "https://nodesecurity.io/advisories/654"
]
}
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 995ca1720..722d8ea98 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -116,7 +116,7 @@ export const withRemoveTag = withMutation(
asset_id: assetId,
item_type: itemType,
},
- o3timisticResponse: {
+ optimisticResponse: {
removeTag: {
__typename: 'ModifyTagResponse',
errors: null,
diff --git a/models/schema/user.js b/models/schema/user.js
index a4ccfd185..a27b8dc39 100644
--- a/models/schema/user.js
+++ b/models/schema/user.js
@@ -339,6 +339,11 @@ User.virtual('banned')
})
.set(function(status) {
this.status.banned.status = status;
+
+ if (!this.status.banned.history) {
+ this.status.banned.history = [];
+ }
+
this.status.banned.history.push({
status,
created_at: new Date(),
@@ -357,6 +362,11 @@ User.virtual('suspended')
})
.set(function(until) {
this.status.suspension.until = until;
+
+ if (!this.status.suspension.history) {
+ this.status.suspension.history = [];
+ }
+
this.status.suspension.history.push({
until,
created_at: new Date(),
diff --git a/package.json b/package.json
index 97f4e373d..c387d6145 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
"metascraper-title": "^3.9.2",
"minimist": "^1.2.0",
"moment": "^2.18.1",
- "mongoose": "^4.12.3",
+ "mongoose": "^5.1.1",
"ms": "^2.0.0",
"murmurhash-js": "^1.0.0",
"name-all-modules-plugin": "^1.0.1",
@@ -231,7 +231,7 @@
"husky": "^0.14.3",
"identity-obj-proxy": "^3.0.0",
"jest-junit": "^3.6.0",
- "lint-staged": "^7.0.0",
+ "lint-staged": "^7.1.0",
"mocha": "^3.1.2",
"mocha-junit-reporter": "^1.12.1",
"nightwatch": "^0.9.16",
diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
index 179fa0193..c2055a16e 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
@@ -63,17 +63,18 @@ class DeleteMyAccount extends React.Component {
{t('delete_request.delete_my_account_description')}
-
- {scheduledDeletionDate &&
- t(
- 'delete_request.already_submitted_request_description',
- moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
- )}
-
{scheduledDeletionDate ? (
-
+
+
+ {t(
+ 'delete_request.already_submitted_request_description',
+ moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
+ )}
+
+
+
) : (