000d588407
Merge pull request #1521 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
4 years ago
069a6ab162
Fix the follow recommendation admin page on glitch-soc
4 years ago
f5a9971cac
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
Not really a conflict, upstream change (removing the spam checker) too close
to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
Same.
- `app/services/remove_status_service.rb`:
Same.
- `app/views/admin/settings/edit.html.haml`:
Same.
- `config/settings.yml`:
Same.
- `config/environments/production.rb`:
Not a real conflict, upstream added a default HTTP header, but we have
extra headers in glitch-soc.
Added the header.
4 years ago
4bffe10987
Fix newlines not being considered sentence separators in account note ( #16079 )
...
Also bullets
4 years ago
37183113d4
Bump webpack-assets-manifest from 4.0.4 to 4.0.5 ( #16070 )
...
Bumps [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest ) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/webdeveric/webpack-assets-manifest/releases )
- [Commits](https://github.com/webdeveric/webpack-assets-manifest/compare/v4.0.4...v4.0.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d9c3e36d63
Bump js-yaml from 4.0.0 to 4.1.0 ( #16067 )
...
Bumps [js-yaml](https://github.com/nodeca/js-yaml ) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/nodeca/js-yaml/releases )
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nodeca/js-yaml/compare/4.0.0...4.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1ca7b7c28f
Bump aws-sdk-s3 from 1.93.0 to 1.93.1 ( #16071 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.93.0 to 1.93.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
efe8576a93
Bump mini-css-extract-plugin from 1.4.1 to 1.5.0 ( #16061 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.4.1...v1.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
7006a0f125
Bump css-loader from 5.2.1 to 5.2.2 ( #16074 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 5.2.1 to 5.2.2.
- [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/v5.2.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a0bf45998b
Bump sass from 1.32.8 to 1.32.10 ( #16063 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.8 to 1.32.10.
- [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.32.8...1.32.10 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
f0e70dee46
Bump webpack-bundle-analyzer from 4.4.0 to 4.4.1 ( #16073 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 4.4.0 to 4.4.1.
- [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/v4.4.0...v4.4.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
21ebf536e4
Add Message-ID header to outgoing emails ( #16076 )
...
* Add Message-ID header to outgoing emails
* Use email domain name from SMTP_FROM_ADDRESS, fallback on WEB_DOMAIN on failure
* Use notifications@localhost as fallback for SMTP_FROM_ADDRESS, do not catch parse errors
4 years ago
7b24480688
Bump redis from 3.1.0 to 3.1.1 ( #16065 )
...
Bumps [redis](https://github.com/NodeRedis/node-redis ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/NodeRedis/node-redis/releases )
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/NodeRedis/node-redis/compare/v3.1.0...v3.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
393db11d46
Bump ws from 7.4.4 to 7.4.5 ( #16072 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.4.4...7.4.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a9185b2980
Bump ssri from 6.0.1 to 6.0.2 ( #16075 )
...
Bumps [ssri](https://github.com/npm/ssri ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases )
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md )
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d2ff043516
Bump tty-prompt from 0.23.0 to 0.23.1 ( #16066 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.23.0 to 0.23.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.23.0...v0.23.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
7bd8f2abd4
Bump cld3 from 3.4.1 to 3.4.2 ( #16069 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.1...v3.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
9690bfd212
Bump oj from 3.11.3 to 3.11.5 ( #16068 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.3 to 3.11.5.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.11.3...v3.11.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a0d856f5a0
Bump connection_pool from 2.2.3 to 2.2.5 ( #16062 )
...
Bumps [connection_pool](https://github.com/mperham/connection_pool ) from 2.2.3 to 2.2.5.
- [Release notes](https://github.com/mperham/connection_pool/releases )
- [Changelog](https://github.com/mperham/connection_pool/blob/master/Changes.md )
- [Commits](https://github.com/mperham/connection_pool/compare/v2.2.3...v2.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
ac2f9edf45
Bump sidekiq-unique-jobs from 7.0.7 to 7.0.8 ( #16064 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.7...v7.0.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
052fb31256
Change onboarding by replacing tutorial with follow recommendations in web UI ( #16060 )
4 years ago
e6a6d37009
Refactor StatusReachFinder to handle followers and relays as well ( #16051 )
4 years ago
9adb8dd9ee
Fix remote reporters not receiving suspend/unsuspend activities ( #16050 )
4 years ago
6d78b064e3
Fix missing source strings and inconsistent lead text style in admin UI ( #16052 )
4 years ago
c9bb0e576d
Add canonical e-mail blocks for suspended accounts ( #16049 )
...
Prevent new accounts from being created using the same underlying
e-mail as a suspended account using extensions and period
permutations. Stores e-mails as a SHA256 hash
4 years ago
0f397bfa75
Fix wrong timestamp_id identifier for accounts table in schema.rb ( #16048 )
4 years ago
4d4ed90438
Fix reports of already suspended accounts being recorded ( #16047 )
4 years ago
ecb285afb8
Fix not to show follow button in global suggestion ( #16045 )
...
* Fix not to show follow button in global suggestion
* Fix style
4 years ago
86458297ac
Fix to update suggestion list after dismiss ( #16044 )
...
* Fix to update suggestion list after dismiss
* Change to inline
* Fix style
4 years ago
5d0cbe4892
Fix app name, website and redirect URIs not having a maximum length ( #16042 )
...
Fix app scopes not being validated
4 years ago
f45b084e1c
Change option labels on edit profile page ( #16041 )
4 years ago
ec0860b462
Change account ids to snowflake ids ( #15844 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
4 years ago
2cab9c9f06
Add `policy` param to `POST /api/v1/push/subscriptions` ( #16040 )
...
With possible values `all`, `followed`, `follower`, and `none`,
control from whom notifications will generate a Web Push alert
4 years ago
0778ebc0b9
Fix an error with 'multiple mentions with same username' ( #16038 )
4 years ago
89ef33df51
Add border to 🚲 emoji ( #16035 )
4 years ago
8bb856c1ef
Add HTTP header to explicitly opt out of FLoC by default ( #16036 )
...
Fixes #16034
4 years ago
a13ac60bc9
Bump nsa from git to 0.2.8 ( #16033 )
4 years ago
27e58eec7d
Bump eslint-plugin-promise from 4.3.1 to 5.1.0 ( #16022 )
...
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise ) from 4.3.1 to 5.1.0.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases )
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md )
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
76781052b7
Bump css-loader from 5.2.0 to 5.2.1 ( #16029 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 5.2.0 to 5.2.1.
- [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/v5.2.0...v5.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
8e0222e443
Bump @babel/preset-env from 7.13.12 to 7.13.15 ( #16028 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.13.12 to 7.13.15.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.13.15/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
acf7352ae1
Bump @babel/core from 7.13.14 to 7.13.15 ( #16027 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.13.14 to 7.13.15.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.13.15/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
243194f45e
Bump webpack-assets-manifest from 4.0.2 to 4.0.4 ( #16025 )
...
Bumps [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest ) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/webdeveric/webpack-assets-manifest/releases )
- [Commits](https://github.com/webdeveric/webpack-assets-manifest/compare/v4.0.2...v4.0.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
e4eaa786a1
Bump eslint-plugin-react from 7.23.1 to 7.23.2 ( #16030 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.23.1 to 7.23.2.
- [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.23.1...v7.23.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
17a7b80ffb
Bump mini-css-extract-plugin from 1.4.0 to 1.4.1 ( #16031 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.4.0...v1.4.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
46df973e6b
Bump @babel/plugin-transform-runtime from 7.13.10 to 7.13.15 ( #16023 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.13.10 to 7.13.15.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.13.15/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
84527a2ec1
Bump eslint from 7.23.0 to 7.24.0 ( #16018 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.23.0 to 7.24.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/v7.23.0...v7.24.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
9f75129a90
Bump @babel/plugin-proposal-decorators from 7.13.5 to 7.13.15 ( #16021 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.13.5 to 7.13.15.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.13.15/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d9e0a614b4
Bump cssnano from 4.1.10 to 4.1.11 ( #16020 )
...
Bumps [cssnano](https://github.com/cssnano/cssnano ) from 4.1.10 to 4.1.11.
- [Release notes](https://github.com/cssnano/cssnano/releases )
- [Commits](https://github.com/cssnano/cssnano/compare/v4.1.10...v4.1.11 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
dcb4bbc590
Bump parallel_tests from 3.6.0 to 3.7.0 ( #16024 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.6.0...v3.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a8bf951926
Change Web Push API deliveries to use request pooling ( #16014 )
4 years ago
Claire
Eugen Rochko
dependabot[bot]
Takeshi Umeda