diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-02 16:15:36 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-06-02 16:15:36 -0500 |
| commit | 3550470c18425e80a322e6fe56245c9ede3d0689 (patch) | |
| tree | 10c7539e0bf80a9a5d20aa2c8acf227803d3789b /.eslintrc.yml | |
| parent | a641d1b5b8e9f20104ab16e5419e6dee4e5af37f (diff) | |
| parent | 00512ecf87e1098f5632eeec2cd116344a787523 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.
Diffstat (limited to '.eslintrc.yml')
| -rw-r--r-- | .eslintrc.yml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml index da12088b4..e48e3a12e 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -118,13 +118,23 @@ rules: jsx-a11y/accessible-emoji: warn jsx-a11y/alt-text: warn jsx-a11y/anchor-has-content: warn + jsx-a11y/anchor-is-valid: + - warn + - components: + - Link + - NavLink + specialLink: + - to + aspect: + - noHref + - invalidHref + - preferButton jsx-a11y/aria-activedescendant-has-tabindex: warn jsx-a11y/aria-props: warn jsx-a11y/aria-proptypes: warn jsx-a11y/aria-role: warn jsx-a11y/aria-unsupported-elements: warn jsx-a11y/heading-has-content: warn - jsx-a11y/href-no-hash: warn jsx-a11y/html-has-lang: warn jsx-a11y/iframe-has-title: warn jsx-a11y/img-redundant-alt: warn |