74c5b2bd08
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
5 years ago
4f3e183dc8
Bump jest from 24.8.0 to 24.9.0 ( #11781 )
...
Bumps [jest](https://github.com/facebook/jest ) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c12cdbe81c
Bump @babel/preset-env from 7.5.5 to 7.6.0 ( #11780 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.5.5 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.5.5...v7.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9fa5c43d80
Bump tesseract.js from 2.0.0-alpha.13 to 2.0.0-alpha.15 ( #11779 )
...
Bumps [tesseract.js](https://github.com/naptha/tesseract.js ) from 2.0.0-alpha.13 to 2.0.0-alpha.15.
- [Release notes](https://github.com/naptha/tesseract.js/releases )
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.13...v2.0.0-alpha.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5088eb8388
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ac6935b629
Bump babel-eslint from 10.0.2 to 10.0.3 ( #11723 )
...
Bumps [babel-eslint](https://github.com/babel/babel-eslint ) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases )
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dd45df6630
Bump @babel/plugin-transform-runtime from 7.4.4 to 7.5.5 ( #11725 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.4.4 to 7.5.5.
- [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.5.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9044a2b051
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
5 years ago
f6e7f94146
node v12 support ( #11706 )
5 years ago
48b8a1f414
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
5 years ago
49810ba1dc
Bump webpack-cli from 3.3.6 to 3.3.7 ( #11663 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8a39bde967
Bump @babel/plugin-proposal-class-properties from 7.5.0 to 7.5.5 ( #11661 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.5.0 to 7.5.5.
- [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.0...v7.5.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4b6978d556
Bump react-redux from 7.1.0 to 7.1.1 ( #11664 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.0...v7.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4190e31626
Add audio player ( #11644 )
5 years ago
df150da435
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/initializers/content_security_policy.rb
(took our version)
5 years ago
97af209c31
Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 ( #11609 )" ( #11625 )
...
This reverts commit 2e44b81166
5 years ago
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
5 years ago
2e44b81166
Bump react-redux-loading-bar from 4.0.8 to 4.4.0 ( #11609 )
...
Bumps [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar ) from 4.0.8 to 4.4.0.
- [Release notes](https://github.com/mironov/react-redux-loading-bar/releases )
- [Changelog](https://github.com/mironov/react-redux-loading-bar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mironov/react-redux-loading-bar/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
467b95d67c
Bump redux from 4.0.1 to 4.0.4 ( #11608 )
...
Bumps [redux](https://github.com/reduxjs/redux ) from 4.0.1 to 4.0.4.
- [Release notes](https://github.com/reduxjs/redux/releases )
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/redux/compare/v4.0.1...v4.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
20c368cd0b
Bump file-loader from 4.1.0 to 4.2.0 ( #11607 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.1.0...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
173ebefe37
Bump rimraf from 2.6.3 to 3.0.0 ( #11610 )
...
Bumps [rimraf](https://github.com/isaacs/rimraf ) from 2.6.3 to 3.0.0.
- [Release notes](https://github.com/isaacs/rimraf/releases )
- [Commits](https://github.com/isaacs/rimraf/compare/v2.6.3...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
28636f43e4
Add OCR tool to media editing modal ( #11566 )
5 years ago
c4ae7aab6f
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
74111bbb1c
Bump sass from 1.22.7 to 1.22.9 ( #11545 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.22.7 to 1.22.9.
- [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.7...1.22.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4b21a9db2f
Bump webpack-dev-server from 3.7.2 to 3.8.0 ( #11546 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.7.2 to 3.8.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.7.2...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0b28890357
Bump css-loader from 3.1.0 to 3.2.0 ( #11544 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.1.0...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8a2afb576d
Bump terser-webpack-plugin from 1.3.0 to 1.4.1 ( #11542 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 1.3.0 to 1.4.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.3.0...v1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e50554391a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
a954159781
Bump @babel/plugin-transform-react-jsx-source from 7.2.0 to 7.5.0 ( #11482 )
...
Bumps [@babel/plugin-transform-react-jsx-source](https://github.com/babel/babel ) from 7.2.0 to 7.5.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.2.0...v7.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b5b33fbbeb
Bump webpack-cli from 3.3.5 to 3.3.6 ( #11481 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.6/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.5...v3.3.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f640f74c21
Bump eslint-plugin-react from 7.14.2 to 7.14.3 ( #11480 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.14.2 to 7.14.3.
- [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.2...v7.14.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
24968d20a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
5 years ago
85b7b565de
Bump yargs from 12.0.5 to 13.3.0 ( #11434 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 12.0.5 to 13.3.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v12.0.5...v13.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a586248f08
Bump sass from 1.20.3 to 1.22.7 ( #11432 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.20.3 to 1.22.7.
- [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.20.3...1.22.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
25731bafed
Bump autoprefixer from 9.6.0 to 9.6.1 ( #11431 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.6.0 to 9.6.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.6.0...9.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2f0820963d
Bump @babel/preset-env from 7.4.5 to 7.5.5 ( #11433 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.4.5 to 7.5.5.
- [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.5.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e9a7d721d8
Bump file-loader from 4.0.0 to 4.1.0 ( #11430 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.0.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2d35e4460a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
24367ef906
Bump css-loader from 2.1.1 to 3.1.0 ( #11382 )
...
* Bump css-loader from 2.1.1 to 3.1.0
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 2.1.1 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* localIdentName -> modules.localIdentName
5 years ago
444796b69b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
5 years ago
fea903f574
Bump eslint from 5.16.0 to 6.1.0 ( #11383 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 5.16.0 to 6.1.0.
- [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/v5.16.0...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e2b3437a84
Bump babel-eslint from 10.0.1 to 10.0.2 ( #11381 )
...
Bumps [babel-eslint](https://github.com/babel/babel-eslint ) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases )
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
44b04358b3
Bump intl-relativeformat from 6.4.2 to 6.4.3 ( #11380 )
...
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs ) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/formatjs/formatjs/releases )
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@6.4.2...intl-relativeformat@6.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
28a60cb04f
Bump @clusterws/cws from 0.14.0 to 0.15.0 ( #11379 )
...
Bumps @clusterws/cws from 0.14.0 to 0.15.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3598305460
Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 ( #11314 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y ) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
bb7f3e4112
Bump webpack from 4.34.0 to 4.35.3 ( #11309 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.34.0 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
22f1ec1b1e
Bump lodash from 4.17.13 to 4.17.14 ( #11312 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3a1e124f5a
Bump @babel/runtime from 7.4.5 to 7.5.4 ( #11315 )
...
Bumps [@babel/runtime](https://github.com/babel/babel ) from 7.4.5 to 7.5.4.
- [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.5.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f0d288619c
Bump eslint-plugin-import from 2.17.3 to 2.18.0 ( #11310 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4562c3cb7e
Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 ( #11314 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y ) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
Thibaut Girka
dependabot-preview[bot]
abcang
Eugen Rochko