Merge branch 'eslint-indent-enforce' into 'develop'

eslint: error on wrong indentation

See merge request soapbox-pub/soapbox-fe!857
This commit is contained in:
Alex Gleason 2021-11-04 20:29:17 +00:00
commit b648861309
2 changed files with 4 additions and 3 deletions

View file

@ -67,7 +67,7 @@ module.exports = {
'consistent-return': 'error',
'dot-notation': 'error',
eqeqeq: 'error',
indent: ['warn', 2],
indent: ['error', 2],
'jsx-quotes': ['error', 'prefer-single'],
'no-catch-shadow': 'error',
'no-cond-assign': 'error',

View file

@ -117,13 +117,14 @@ class ProfileDropdown extends React.PureComponent {
text: intl.formatMessage(messages.add),
to: '/auth/sign_in',
icon: require('@tabler/icons/icons/plus.svg'),
});
});
menu.push({
text: intl.formatMessage(messages.logout, { acct: account.get('acct') }),
to: '/auth/sign_out',
action: this.handleLogOut,
icon: require('@tabler/icons/icons/logout.svg'),
});
});
return (
<div className='compose__action-bar' style={{ 'marginTop':'-6px' }}>