Merge commit 'c62604b5f6' into kb_migration

app/javascript/mastodon/components/short_number.jsx

@@ -32,17 +32,14 @@ function ShortNumber({ value, renderer, children }) {
   const shortNumber = toShortNumber(value);
   const [, division] = shortNumber;
 
-  // eslint-disable-next-line eqeqeq
   if (children != null && renderer != null) {
     console.warn('Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.');
   }
 
-  // eslint-disable-next-line eqeqeq
   const customRenderer = children != null ? children : renderer;
 
   const displayNumber = <ShortNumberCounter value={shortNumber} />;
 
-  // eslint-disable-next-line eqeqeq
   return customRenderer != null
     ? customRenderer(displayNumber, pluralReady(value, division))
     : displayNumber;

app/javascript/mastodon/utils/numbers.js

@@ -60,7 +60,6 @@ export function toShortNumber(sourceNumber) {
  * // => 1790
  */
 export function pluralReady(sourceNumber, division) {
-  // eslint-disable-next-line eqeqeq
   if (division == null || division < DECIMAL_UNITS.HUNDRED) {
     return sourceNumber;
   }