4 files changed, 7 insertions, 5 deletions
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 9afdf6f4c..6ec4d5dc6 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -65,11 +65,11 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
-  render () { // eslint-disable-line consistent-return
+  render () {
     const { notification } = this.props;
     const account          = notification.get('account');
     const displayName      = account.get('display_name').length > 0 ? account.get('display_name') : account.get('username');
-    const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };
+    const displayNameHTML  = { __html: emojify(escapeTextContentForBrowser(displayName)) };
     const link             = <Permalink className='notification__display-name' href={account.get('url')} title={account.get('acct')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHTML} />;
 
     switch(notification.get('type')) {
@@ -82,6 +82,8 @@ class Notification extends ImmutablePureComponent {
     case 'reblog':
       return this.renderReblog(notification, link);
     }
+
+    return null;
   }
 
 }
diff --git a/app/javascript/mastodon/middleware/errors.js b/app/javascript/mastodon/middleware/errors.js
index 9a51257cb..4aca75f1e 100644
--- a/app/javascript/mastodon/middleware/errors.js
+++ b/app/javascript/mastodon/middleware/errors.js
@@ -22,7 +22,7 @@ export default function errorsMiddleware() {
 
           dispatch(showAlert(title, message));
         } else {
-          console.error(action.error); // eslint-disable-line no-console
+          console.error(action.error);
           dispatch(showAlert('Oops!', 'An unexpected error occurred.'));
         }
       }
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 8932dc513..63c5d6272 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -2,5 +2,5 @@ import main from '../mastodon/main';
 import loadPolyfills from '../mastodon/load_polyfills';
 
 loadPolyfills().then(main).catch(e => {
-  console.error(e); // eslint-disable-line no-console
+  console.error(e);
 });
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 4c0a3d693..a0e511b0a 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -93,5 +93,5 @@ function main() {
 }
 
 loadPolyfills().then(main).catch(error => {
-  console.log(error); // eslint-disable-line no-console
+  console.error(error);
 });