tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
This commit is contained in:
Thibaut Girka
2019-06-07 17:00:36 +02:00
parent 8360019896 a60364ca7d
commit 34b8346e7f
63 changed files with 239 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@ -10,9 +10,10 @@
"build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
"manage:translations": "node ./config/webpack/translationRunner.js",
"start": "node ./streaming/index.js",
"test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
"test:lint": "eslint --ext=js .",
"test:lint:sass": "sass-lint .",
"test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
"test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
"test:lint:js": "eslint --ext=js .",
"test:lint:sass": "sass-lint -v",
"test:jest": "cross-env NODE_ENV=test jest --coverage"
},
"repository": {