Merge pull request #3922 from withspectrum/2.4.36

2.4.36

Author: brianlovin

api/package.json

@@ -56,13 +56,13 @@
     "host-validation": "^1.1.0",
     "hpp": "^0.2.2",
     "imgix-core-js": "^1.2.0",
-    "immutability-helper": "^2.7.1",
+    "immutability-helper": "^2.8.0",
     "isomorphic-fetch": "^2.2.1",
     "iterall": "^1.2.2",
     "jest": "^21.2.1",
     "json-stringify-pretty-compact": "^1.2.0",
     "jsonwebtoken": "^8.3.0",
-    "keygrip": "^1.0.2",
+    "keygrip": "^1.0.3",
     "linkify-it": "^2.0.3",
     "localstorage-memory": "^1.0.2",
     "lodash": "^4.17.10",

api/routes/api/email.js

@@ -74,7 +74,7 @@ emailRouter.get('/unsubscribe', (req, res) => {
           res
             .status(200)
             .send(
-              'You will no longer recieve new thread emails from this channel.'
+              'You will no longer receive new thread emails from this channel.'
             )
         );
       case 'muteCommunity':
@@ -87,7 +87,7 @@ emailRouter.get('/unsubscribe', (req, res) => {
             res
               .status(200)
               .send(
-                'You will no longer recieve new thread emails from this community.'
+                'You will no longer receive new thread emails from this community.'
               )
           );
       case 'muteThread':
@@ -99,7 +99,7 @@ emailRouter.get('/unsubscribe', (req, res) => {
           res
             .status(200)
             .send(
-              'You will no longer recieve emails about new messages in this thread.'
+              'You will no longer receive emails about new messages in this thread.'
             )
         );
       case 'muteDirectMessageThread':
@@ -111,7 +111,7 @@ emailRouter.get('/unsubscribe', (req, res) => {
           res
             .status(200)
             .send(
-              'You will no longer recieve emails about new messages in this direct message conversation.'
+              'You will no longer receive emails about new messages in this direct message conversation.'
             )
         );
       default: {

api/yarn.lock

@@ -3870,9 +3870,9 @@ imgix-core-js@^1.2.0:
     js-base64 "^2.1.9"
     md5 "^2.2.1"
 
-immutability-helper@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.7.1.tgz#5636dbb593e3deb5e572766d42249ea06bae7640"
+immutability-helper@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.8.0.tgz#f2ade82c23c93dfead3c2c3c4c1753cce47544f6"
   dependencies:
     invariant "^2.2.0"
 
@@ -4730,7 +4730,11 @@ keycode@^2.1.2:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
 
-keygrip@^1.0.2, keygrip@~1.0.2:
+keygrip@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc"
+
+keygrip@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.2.tgz#ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"
 

athena/queues/reaction-notification.js

@@ -77,7 +77,7 @@ export default async (job: Job<ReactionNotificationJobData>) => {
 
     debug('mark notification as new for sender');
 
-    // if the user is allowed to recieve notifications, update their notification
+    // if the user is allowed to receive notifications, update their notification
     return Promise.all([
       markUsersNotificationsAsNew(updatedNotification.id, message.senderId),
     ]).catch(err => {

athena/queues/thread-reaction-notification.js

@@ -71,7 +71,7 @@ export default async (job: Job<ThreadReactionNotificationJobData>) => {
 
     debug('mark notification as new for sender');
 
-    // if the user is allowed to recieve notifications, update their notification
+    // if the user is allowed to receive notifications, update their notification
     return Promise.all([
       markUsersNotificationsAsNew(updatedNotification.id, thread.creatorId),
     ]).catch(err => {

chronos/package.json

@@ -6,7 +6,7 @@
     "bull": "3.3.10",
     "debug": "^2.6.9",
     "draft-js": "^0.10.5",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.11",
     "lodash.intersection": "^4.4.0",
     "now-env": "^3.1.0",
     "postmark": "^1.3.1",

chronos/yarn.lock

@@ -243,9 +243,9 @@ lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
-lodash@^4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+lodash@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
 lodash@^4.17.4:
   version "4.17.4"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.35",
+  "version": "2.4.36",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",

src/views/navbar/components/notificationsTab.js

@@ -247,7 +247,7 @@ class NotificationsTab extends React.Component<Props, State> {
     // and we want to mark notifications as read as they view threads
     // if we do not pass in notifications from the state when this method is
     // invoked, it is because the incoming props have changed from the server
-    // i.e. a new notification was recieved, so we should therefore run
+    // i.e. a new notification was received, so we should therefore run
     // the rest of this method on the incoming notifications data
     const nodes = stateNotifications
       ? stateNotifications