Skip to content

Commit effb71c

Browse files
committed
Merge branch '2.7rc' into run/nyan
2 parents 765d932 + 81b0719 commit effb71c

499 files changed

Lines changed: 12865 additions & 7274 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
aliases:
44
- &defaults
55
docker:
6-
- image: circleci/ruby:2.5.1-stretch-node
6+
- image: circleci/ruby:2.6.0-stretch-node
77
environment: &ruby_environment
88
BUNDLE_APP_CONFIG: ./.bundle/
99
DB_HOST: localhost
@@ -98,21 +98,21 @@ jobs:
9898
<<: *defaults
9999
<<: *install_steps
100100

101-
install-ruby2.5:
101+
install-ruby2.6:
102102
<<: *defaults
103103
<<: *install_ruby_dependencies
104104

105-
install-ruby2.4:
105+
install-ruby2.5:
106106
<<: *defaults
107107
docker:
108-
- image: circleci/ruby:2.4.4-stretch-node
108+
- image: circleci/ruby:2.5.3-stretch-node
109109
environment: *ruby_environment
110110
<<: *install_ruby_dependencies
111111

112-
install-ruby2.3:
112+
install-ruby2.4:
113113
<<: *defaults
114114
docker:
115-
- image: circleci/ruby:2.3.7-stretch-node
115+
- image: circleci/ruby:2.4.5-stretch-node
116116
environment: *ruby_environment
117117
<<: *install_ruby_dependencies
118118

@@ -128,43 +128,43 @@ jobs:
128128
- ./mastodon/public/assets
129129
- ./mastodon/public/packs-test/
130130

131-
test-ruby2.5:
131+
test-ruby2.6:
132132
<<: *defaults
133133
docker:
134-
- image: circleci/ruby:2.5.1-stretch-node
134+
- image: circleci/ruby:2.6.0-stretch-node
135135
environment: *ruby_environment
136-
- image: circleci/postgres:10.3-alpine
136+
- image: circleci/postgres:10.6-alpine
137137
environment:
138138
POSTGRES_USER: root
139-
- image: circleci/redis:4.0.9-alpine
139+
- image: circleci/redis:5.0.3-alpine3.8
140140
<<: *test_steps
141141

142-
test-ruby2.4:
142+
test-ruby2.5:
143143
<<: *defaults
144144
docker:
145-
- image: circleci/ruby:2.4.4-stretch-node
145+
- image: circleci/ruby:2.5.3-stretch-node
146146
environment: *ruby_environment
147-
- image: circleci/postgres:10.3-alpine
147+
- image: circleci/postgres:10.6-alpine
148148
environment:
149149
POSTGRES_USER: root
150-
- image: circleci/redis:4.0.9-alpine
150+
- image: circleci/redis:4.0.12-alpine
151151
<<: *test_steps
152152

153-
test-ruby2.3:
153+
test-ruby2.4:
154154
<<: *defaults
155155
docker:
156-
- image: circleci/ruby:2.3.7-stretch-node
156+
- image: circleci/ruby:2.4.5-stretch-node
157157
environment: *ruby_environment
158-
- image: circleci/postgres:10.3-alpine
158+
- image: circleci/postgres:10.6-alpine
159159
environment:
160160
POSTGRES_USER: root
161-
- image: circleci/redis:4.0.9-alpine
161+
- image: circleci/redis:4.0.12-alpine
162162
<<: *test_steps
163163

164164
test-webui:
165165
<<: *defaults
166166
docker:
167-
- image: circleci/node:8.11.1-stretch
167+
- image: circleci/node:8.15.0-stretch
168168
steps:
169169
- *attach_workspace
170170
- run: ./bin/retry yarn test:jest
@@ -183,20 +183,24 @@ workflows:
183183
build-and-test:
184184
jobs:
185185
- install
186-
- install-ruby2.5:
186+
- install-ruby2.6:
187187
requires:
188188
- install
189-
- install-ruby2.4:
189+
- install-ruby2.5:
190190
requires:
191191
- install
192-
- install-ruby2.5
193-
- install-ruby2.3:
192+
- install-ruby2.6
193+
- install-ruby2.4:
194194
requires:
195195
- install
196-
- install-ruby2.5
196+
- install-ruby2.6
197197
- build:
198198
requires:
199-
- install-ruby2.5
199+
- install-ruby2.6
200+
- test-ruby2.6:
201+
requires:
202+
- install-ruby2.6
203+
- build
200204
- test-ruby2.5:
201205
requires:
202206
- install-ruby2.5
@@ -205,13 +209,9 @@ workflows:
205209
requires:
206210
- install-ruby2.4
207211
- build
208-
- test-ruby2.3:
209-
requires:
210-
- install-ruby2.3
211-
- build
212212
- test-webui:
213213
requires:
214214
- install
215215
- check-i18n:
216216
requires:
217-
- install-ruby2.5
217+
- install-ruby2.6

.codeclimate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugins:
2727
enabled: true
2828
eslint:
2929
enabled: true
30-
channel: eslint-4
30+
channel: eslint-5
3131
rubocop:
3232
enabled: true
3333
channel: rubocop-0-54

.eslintignore

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
1-
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
2-
#
3-
# If you find yourself ignoring temporary files generated by your text editor
4-
# or operating system, you probably want to add a global ignore instead:
5-
# git config --global core.excludesfile '~/.gitignore_global'
6-
7-
# Ignore bundler config.
8-
/.bundle
9-
10-
# Ignore the default SQLite database.
11-
/db/*.sqlite3
12-
/db/*.sqlite3-journal
13-
14-
# Ignore all logfiles and tempfiles.
15-
/log/*
16-
!/log/.keep
17-
/tmp
18-
coverage
19-
public/system
20-
public/assets
21-
.env
22-
.env.production
23-
node_modules/
24-
neo4j/
25-
26-
# Ignore Vagrant files
27-
.vagrant/
28-
29-
# Ignore Capistrano customizations
30-
config/deploy/*
1+
/build/**
2+
/coverage/**
3+
/db/**
4+
/lib/**
5+
/log/**
6+
/node_modules/**
7+
/nonobox/**
8+
/public/**
9+
!/public/embed.js
10+
/spec/**
11+
/tmp/**
12+
/vendor/**
13+
!.eslintrc.js

.eslintrc.js

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
module.exports = {
2+
root: true,
3+
4+
env: {
5+
browser: true,
6+
node: true,
7+
es6: true,
8+
jest: true,
9+
},
10+
11+
globals: {
12+
ATTACHMENT_HOST: false,
13+
},
14+
15+
parser: 'babel-eslint',
16+
17+
plugins: [
18+
'react',
19+
'jsx-a11y',
20+
'import',
21+
'promise',
22+
],
23+
24+
parserOptions: {
25+
sourceType: 'module',
26+
ecmaFeatures: {
27+
experimentalObjectRestSpread: true,
28+
jsx: true,
29+
},
30+
ecmaVersion: 2018,
31+
},
32+
33+
settings: {
34+
react: {
35+
version: 'detect',
36+
},
37+
'import/extensions': [
38+
'.js',
39+
],
40+
'import/ignore': [
41+
'node_modules',
42+
'\\.(css|scss|json)$',
43+
],
44+
},
45+
46+
rules: {
47+
'brace-style': 'warn',
48+
'comma-dangle': ['error', 'always-multiline'],
49+
'comma-spacing': [
50+
'warn',
51+
{
52+
before: false,
53+
after: true,
54+
},
55+
],
56+
'comma-style': ['warn', 'last'],
57+
'consistent-return': 'error',
58+
'dot-notation': 'error',
59+
eqeqeq: 'error',
60+
indent: ['warn', 2],
61+
'jsx-quotes': ['error', 'prefer-single'],
62+
'no-catch-shadow': 'error',
63+
'no-cond-assign': 'error',
64+
'no-console': [
65+
'warn',
66+
{
67+
allow: [
68+
'error',
69+
'warn',
70+
],
71+
},
72+
],
73+
'no-fallthrough': 'error',
74+
'no-irregular-whitespace': 'error',
75+
'no-mixed-spaces-and-tabs': 'warn',
76+
'no-nested-ternary': 'warn',
77+
'no-trailing-spaces': 'warn',
78+
'no-undef': 'error',
79+
'no-unreachable': 'error',
80+
'no-unused-expressions': 'error',
81+
'no-unused-vars': [
82+
'error',
83+
{
84+
vars: 'all',
85+
args: 'after-used',
86+
ignoreRestSiblings: true,
87+
},
88+
],
89+
'object-curly-spacing': ['error', 'always'],
90+
'padded-blocks': [
91+
'error',
92+
{
93+
classes: 'always',
94+
},
95+
],
96+
quotes: ['error', 'single'],
97+
semi: 'error',
98+
strict: 'off',
99+
'valid-typeof': 'error',
100+
101+
'react/jsx-boolean-value': 'error',
102+
'react/jsx-closing-bracket-location': ['error', 'line-aligned'],
103+
'react/jsx-curly-spacing': 'error',
104+
'react/jsx-equals-spacing': 'error',
105+
'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
106+
'react/jsx-indent': ['error', 2],
107+
'react/jsx-no-bind': 'error',
108+
'react/jsx-no-duplicate-props': 'error',
109+
'react/jsx-no-undef': 'error',
110+
'react/jsx-tag-spacing': 'error',
111+
'react/jsx-uses-react': 'error',
112+
'react/jsx-uses-vars': 'error',
113+
'react/jsx-wrap-multilines': 'error',
114+
'react/no-multi-comp': 'off',
115+
'react/no-string-refs': 'error',
116+
'react/prop-types': 'error',
117+
'react/self-closing-comp': 'error',
118+
119+
'jsx-a11y/accessible-emoji': 'warn',
120+
'jsx-a11y/alt-text': 'warn',
121+
'jsx-a11y/anchor-has-content': 'warn',
122+
'jsx-a11y/anchor-is-valid': [
123+
'warn',
124+
{
125+
components: [
126+
'Link',
127+
'NavLink',
128+
],
129+
specialLink: [
130+
'to',
131+
],
132+
aspect: [
133+
'noHref',
134+
'invalidHref',
135+
'preferButton',
136+
],
137+
},
138+
],
139+
'jsx-a11y/aria-activedescendant-has-tabindex': 'warn',
140+
'jsx-a11y/aria-props': 'warn',
141+
'jsx-a11y/aria-proptypes': 'warn',
142+
'jsx-a11y/aria-role': 'warn',
143+
'jsx-a11y/aria-unsupported-elements': 'warn',
144+
'jsx-a11y/heading-has-content': 'warn',
145+
'jsx-a11y/html-has-lang': 'warn',
146+
'jsx-a11y/iframe-has-title': 'warn',
147+
'jsx-a11y/img-redundant-alt': 'warn',
148+
'jsx-a11y/interactive-supports-focus': 'warn',
149+
'jsx-a11y/label-has-for': 'off',
150+
'jsx-a11y/mouse-events-have-key-events': 'warn',
151+
'jsx-a11y/no-access-key': 'warn',
152+
'jsx-a11y/no-distracting-elements': 'warn',
153+
'jsx-a11y/no-noninteractive-element-interactions': [
154+
'warn',
155+
{
156+
handlers: [
157+
'onClick',
158+
],
159+
},
160+
],
161+
'jsx-a11y/no-onchange': 'warn',
162+
'jsx-a11y/no-redundant-roles': 'warn',
163+
'jsx-a11y/no-static-element-interactions': [
164+
'warn',
165+
{
166+
handlers: [
167+
'onClick',
168+
],
169+
},
170+
],
171+
'jsx-a11y/role-has-required-aria-props': 'warn',
172+
'jsx-a11y/role-supports-aria-props': 'off',
173+
'jsx-a11y/scope': 'warn',
174+
'jsx-a11y/tabindex-no-positive': 'warn',
175+
176+
'import/extensions': [
177+
'error',
178+
'always',
179+
{
180+
js: 'never',
181+
},
182+
],
183+
'import/newline-after-import': 'error',
184+
'import/no-extraneous-dependencies': [
185+
'error',
186+
{
187+
devDependencies: [
188+
'config/webpack/**',
189+
'app/javascript/mastodon/test_setup.js',
190+
'app/javascript/**/__tests__/**',
191+
],
192+
},
193+
],
194+
'import/no-unresolved': 'error',
195+
'import/no-webpack-loader-syntax': 'error',
196+
197+
'promise/catch-or-return': 'error',
198+
},
199+
};

0 commit comments

Comments
 (0)