ff67385cfb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
5 years ago
5f0cba2561
Bump react-dom from 16.11.0 to 16.12.0 ( #12415 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e8de558ee7
Bump glob from 7.1.5 to 7.1.6 ( #12413 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.1.5 to 7.1.6.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.5...v7.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
6e8d6ba3b7
Bump babel-plugin-preval from 3.0.1 to 4.0.0 ( #12414 )
...
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval ) from 3.0.1 to 4.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases )
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v3.0.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
258539b2c5
Bump react-textarea-autosize from 7.1.0 to 7.1.2 ( #12412 )
...
Bumps [react-textarea-autosize](https://github.com/andreypopp/react-textarea-autosize ) from 7.1.0 to 7.1.2.
- [Release notes](https://github.com/andreypopp/react-textarea-autosize/releases )
- [Commits](https://github.com/andreypopp/react-textarea-autosize/compare/v7.1.0...v7.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7f65eff6c3
Bump @babel/preset-react from 7.6.3 to 7.7.0 ( #12410 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.6.3 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
88ef210af2
Bump copy-webpack-plugin from 5.0.4 to 5.0.5 ( #12408 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v5.0.4...v5.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4bf2e080f4
Bump react-select from 3.0.5 to 3.0.8 ( #12407 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.0.5 to 3.0.8.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.5...react-select@3.0.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c31bc41a02
Bump @babel/core from 7.4.5 to 7.7.2 ( #12350 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.4.5 to 7.7.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ee820caf97
Bump @babel/plugin-proposal-decorators from 7.6.0 to 7.7.0 ( #12348 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.6.0 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
acf132b477
Bump @babel/runtime from 7.7.1 to 7.7.2 ( #12351 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.1 to 7.7.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.7.2/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4cade42b02
Bump enzyme-adapter-react-16 from 1.14.0 to 1.15.1 ( #12353 )
...
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.14.0 to 1.15.1.
- [Release notes](https://github.com/airbnb/enzyme/releases )
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.1/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
58faefe0a5
Bump babel-plugin-react-intl from 3.1.3 to 3.4.1 ( #12352 )
...
Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs ) from 3.1.3 to 3.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases )
- [Commits](https://github.com/formatjs/formatjs/compare/babel-plugin-react-intl@3.1.3...babel-plugin-react-intl@3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
bc1af899b1
Bump react-notification from 6.8.4 to 6.8.5 ( #12349 )
...
Bumps [react-notification](https://github.com/pburtchaell/react-notification ) from 6.8.4 to 6.8.5.
- [Release notes](https://github.com/pburtchaell/react-notification/releases )
- [Commits](https://github.com/pburtchaell/react-notification/compare/6.8.4...6.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
6cbaaac270
Bump uuid from 3.3.2 to 3.3.3 ( #12347 )
...
Bumps [uuid](https://github.com/kelektiv/node-uuid ) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/kelektiv/node-uuid/releases )
- [Changelog](https://github.com/kelektiv/node-uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kelektiv/node-uuid/compare/v3.3.2...v3.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
11cb5e6521
Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0 ( #12346 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.5.5 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ac1709c3e1
Bump @clusterws/cws from 0.15.2 to 0.16.0 ( #12345 )
...
Bumps @clusterws/cws from 0.15.2 to 0.16.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
83774367d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
conflict because of the poll option limit being different than upstream's
5 years ago
699427777a
Bump sass-loader from 7.1.0 to 8.0.0 ( #12027 )
...
* Bump sass-loader from 7.1.0 to 8.0.0
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v8.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* bump webpack
5 years ago
0e4e536036
Bump @babel/runtime from 7.6.0 to 7.7.1 ( #12317 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.6.0 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.7.1/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2a08acac4a
Bump @babel/preset-env from 7.6.0 to 7.7.1 ( #12318 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.6.0 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0c20442605
Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 ( #12311 )
...
Bumps [tesseract.js](https://github.com/naptha/tesseract.js ) from 2.0.0-alpha.16 to 2.0.0-beta.2.
- [Release notes](https://github.com/naptha/tesseract.js/releases )
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.0.0-beta.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4c86b1181d
Bump glob from 7.1.4 to 7.1.5 ( #12312 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.4...v7.1.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c4cf93f787
Bump sass from 1.23.1 to 1.23.3 ( #12314 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.23.1 to 1.23.3.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.23.1...1.23.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
80b1a72742
Bump @babel/preset-react from 7.0.0 to 7.6.3 ( #12315 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.0.0 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.0.0...v7.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0ae7d84273
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
5 years ago
42d9ca21de
Bump webpack-cli from 3.3.9 to 3.3.10 ( #12297 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.9 to 3.3.10.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.9...v3.3.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d84aca66ea
Bump react-overlays from 0.8.3 to 0.9.1 ( #12298 )
...
Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays ) from 0.8.3 to 0.9.1.
- [Release notes](https://github.com/react-bootstrap/react-overlays/releases )
- [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md )
- [Commits](https://github.com/react-bootstrap/react-overlays/compare/v0.8.3...v0.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
674a630bf1
Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 ( #12296 )
...
Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel ) from 7.5.5 to 7.6.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0a9c2db59b
Bump webpack-dev-server from 3.8.1 to 3.9.0 ( #12293 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.8.1...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5c537401d8
Bump react-test-renderer from 16.10.2 to 16.11.0 ( #12295 )
...
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) from 16.10.2 to 16.11.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.11.0/packages/react-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c21c7a2b9b
Bump wavesurfer.js from 3.0.0 to 3.2.0 ( #12292 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.0.0 to 3.2.0.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases )
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md )
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.0.0...3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
086a9211f3
Bump react-toggle from 4.0.2 to 4.1.1 ( #12291 )
...
Bumps [react-toggle](https://github.com/aaronshaf/react-toggle ) from 4.0.2 to 4.1.1.
- [Release notes](https://github.com/aaronshaf/react-toggle/releases )
- [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md )
- [Commits](https://github.com/aaronshaf/react-toggle/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a537d083dd
Bump react-dom from 16.10.2 to 16.11.0 ( #12289 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.10.2 to 16.11.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.11.0/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3cc9ff872f
Use inert polyfill ( #12209 )
...
* Inserting wicg-inert in project
* Import wicg-inert in moda_root component
* Update yarn.lock
* Solving code style problems
* Removing package-lock
5 years ago
1e232e455c
fix: support KaiOS arrow navigation on public pages ( #12251 )
5 years ago
52c9044ea9
Bump dotenv from 8.0.0 to 8.2.0 ( #12235 )
...
Bumps [dotenv](https://github.com/motdotla/dotenv ) from 8.0.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases )
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
008d15d2cd
Bump terser-webpack-plugin from 1.4.1 to 2.2.1 ( #12233 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 1.4.1 to 2.2.1.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v1.4.1...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
da67b1fa37
Bump webpack-bundle-analyzer from 3.5.2 to 3.6.0 ( #12237 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 3.5.2 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases )
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.5.2...v3.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3565fc1a00
Bump eslint-plugin-react from 7.14.3 to 7.16.0 ( #12234 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.14.3 to 7.16.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.14.3...v7.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
91b02afe4a
Bump sass from 1.23.0 to 1.23.1 ( #12238 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.23.0...1.23.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7be994e0a9
Bump @babel/plugin-proposal-decorators from 7.4.4 to 7.6.0 ( #12232 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.4.4 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
41a98b6543
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
5 years ago
6bee7b820d
Bump react-dom from 16.8.6 to 16.10.2 ( #12107 )
...
* Bump react-dom from 16.8.6 to 16.10.2
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.8.6 to 16.10.2.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.10.2/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* update react and react-test-renderer
5 years ago
183fc9d3cb
Bump react-select from 2.4.4 to 3.0.5 ( #11930 )
...
* Bump react-select from 2.4.4 to 3.0.5
Bumps [react-select](https://github.com/JedWatson/react-select ) from 2.4.4 to 3.0.5.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js )
- [Commits](https://github.com/JedWatson/react-select/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Change import path for react-select
5 years ago
bc9c116e60
Bump sass from 1.22.12 to 1.23.0 ( #12108 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.22.12 to 1.23.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.22.12...1.23.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
13b6d5d01b
Bump @clusterws/cws from 0.15.0 to 0.15.2 ( #12109 )
...
Bumps @clusterws/cws from 0.15.0 to 0.15.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1ecd71c53e
Bump eslint from 6.5.0 to 6.5.1 ( #12110 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.5.0 to 6.5.1.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v6.5.0...v6.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ae945cb1f4
Bump cross-env from 5.2.0 to 6.0.3 ( #12112 )
...
Bumps [cross-env](https://github.com/kentcdodds/cross-env ) from 5.2.0 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases )
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v6.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
5 years ago
Thibaut Girka
dependabot-preview[bot]
Gabriel Rubens
Nolan Lawson