50b430d9a2
Merge branch 'main' into glitch-soc/merge-upstream
...
- `app/views/statuses/_simple_status.html.haml`:
Small markup change in glitch-soc, on a line that has been modified by
upstream. Ported upstream changes.
3 years ago
d8e0c8a89e
Do not populate AccountSummaries and FollowRecommendation views on migration ( #16173 )
...
Materializing those views can take a while, and they are currently refreshed
anyway each time they are actually used, in the FollowRecommendationsScheduler.
3 years ago
a5f91a11d0
Fix older migrations on Ruby 3 ( #16174 )
3 years ago
0ad240cb6b
Change home timeline to reload after follow recommendations in web UI ( #16160 )
3 years ago
74081433d0
Change trending hashtags to be affected be reblogs ( #16164 )
...
If a status with a hashtag becomes very popular, it stands to
reason that the hashtag should have a chance at trending
Fix no stats being recorded for hashtags that are not allowed
to trend, and stop ignoring bots
Remove references to hashtags in profile directory from the code
and the admin UI
3 years ago
2c77d97e0d
Add joined date to profiles in web UI ( #16169 )
3 years ago
b42a8ef7d9
Bump url-parse from 1.4.7 to 1.5.1 ( #16172 )
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
b44585aa89
Bump webpacker from 5.2.1 to 5.3.0 ( #16144 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.2.1 to 5.3.0.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v5.2.1...v5.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
9e5bdd8007
Bump devise from 4.7.3 to 4.8.0 ( #16140 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.3 to 4.8.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.3...v4.8.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
09f051d0b7
Bump yargs from 16.2.0 to 17.0.0 ( #16149 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 16.2.0 to 17.0.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/v16.2.0...v17.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
566fc90913
Add Ruby 3.0 support ( #16046 )
...
* Fix issues with POSIX::Spawn, Terrapin and Ruby 3.0
Also improve the Terrapin monkey-patch for the stderr/stdout issue.
* Fix keyword argument handling throughout the codebase
* Monkey-patch Paperclip to fix keyword arguments handling in validators
* Change validation_extensions to please CodeClimate
* Bump microformats from 4.2.1 to 4.3.1
* Allow Ruby 3.0
* Add Ruby 3.0 test target to CircleCI
* Add test for admin dashboard warnings
* Fix admin dashboard warnings on Ruby 3.0
3 years ago
0a3fa034fc
Fix "You might be interested in" flashing while searching in web UI ( #16162 )
3 years ago
8d75bd002d
Add empty state message for follow recommendations in web UI ( #16161 )
3 years ago
6d9ad30bf8
Fix media redownload worker retrying on unexpected response codes ( #16111 )
3 years ago
aa1b43f467
Fix display of toots without text content ( #15665 )
...
* Fix display of toots without text content
- fixes CWs from other implementations not showing up if toot has no text
contents
- fixes the “Read more” thread indicator not showing up on threaded toots
with no text contents
* Move content-less toot's CW to conents
3 years ago
7cb34b32f8
Add management of delivery availability in Federation settings ( #15771 )
...
* Add management of delivery availavility in Federation settings
* fix translate
* Remove useless object creation
* Fix DeepSource issue
* Add shortcut for all
* Fix DeepSource(skipcq)
* Change 'remove' to 'clear'
* Fix style
* Change class method name (exhausted_deliveries_key_by)
3 years ago
d9ae3db8d5
Improve performance of follow recommendation scheduler ( #16159 )
...
Express follow_recommendations in terms of account_summaries rather than
accounts, integrate filters that are unconditionally used, and materialize
the resulting view.
This should result in the bulk of the computation being performed only once
instead of **once per recommendation language**.
3 years ago
351c744590
Fix error when trying to render component for media without meta ( #16112 )
3 years ago
059df83d1d
Fix database serialization failure returning HTTP 500 ( #16101 )
...
Database serialization failure occurs when a read-replica is used
and a query takes long enough that rows on the primary database
become unavailable. It should return HTTP 503 as it is temporary.
Re-order rescue definitions according to their status codes
3 years ago
036556d350
Fix media processing getting stuck on too much stdin/stderr ( #16136 )
...
* Fix media processing getting stuck on too much stdin/stderr
See thoughtbot/terrapin#5
* Remove dependency on paperclip-av-transcoder gem
* Remove dependency on streamio-ffmpeg gem
* Disable stdin on ffmpeg process
3 years ago
dfa002932d
Workaround Resolv::DNS-induced hangs by installing resolv 0.1.0 ( #16157 )
...
See https://github.com/tootsuite/mastodon/pull/16154#issuecomment-832062139
3 years ago
25345c90ff
Fix how to change connection pool for rails 6 ( #16158 )
...
* Fix how to change connection pool for rails 6
* Fix to match the code elsewhere
3 years ago
19d3809ad5
Improve description of keyboard shortcuts ( #16129 )
...
* Remove useless “to” from shortcuts description
* Improve descriptions of keyboard shortcuts
* Use curved quotations marks instead of straight ones
3 years ago
dde0529fbc
Remove dependency for @babel/plugin-proposal-class-properties ( #16155 )
3 years ago
d95128c99d
Revert default Ruby version to 2.7.2 ( #16154 )
...
Ruby 2.7.3 introduced a new bug with Resolv::DNS, which we heavily use within
Mastodon: https://bugs.ruby-lang.org/issues/17781
Ruby 2.7.3 also included security fixes for two CVEs, but those do not seem
to apply to Mastodon:
https://github.com/tootsuite/mastodon/pull/16004#issuecomment-815125025
3 years ago
3639862dee
Fix existing username validator not allowing multiple accounts ( #16153 )
...
Fix #16107
3 years ago
fab65848d2
Fix empty home feed before first follow has finished processing ( #16152 )
...
Change queue of merge worker from pull to default
3 years ago
8c44b723bb
Change confirmations controller to redirect to / for approved users ( #16151 )
...
Clicking the confirmation link multiple times currently leads to entering
account settings, which can be confusing. This commit changes that so that
it redirects to the root path, so it behaves the same way as clicking only
once in most cases.
3 years ago
09bb92875d
Bump mini-css-extract-plugin from 1.5.0 to 1.6.0 ( #16150 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.5.0 to 1.6.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.5.0...v1.6.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
8a33b7ac49
Bump @babel/preset-env from 7.13.15 to 7.14.0 ( #16145 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.13.15 to 7.14.0.
- [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.14.0/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c35a6b9e01
fix component name ( #16138 )
...
It seems forget renaming when It copied from MissingIndicator.
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
3 years ago
b75ecb083f
Bump @babel/runtime from 7.13.17 to 7.14.0 ( #16148 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.13.17 to 7.14.0.
- [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.14.0/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
970ffd8d1a
Bump aws-sdk-s3 from 1.93.1 to 1.94.0 ( #16143 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.93.1 to 1.94.0.
- [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>
3 years ago
c35befb3e4
Bump @babel/core from 7.13.16 to 7.14.0 ( #16141 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.13.16 to 7.14.0.
- [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.14.0/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
bcf63e6e26
Bump sass from 1.32.11 to 1.32.12 ( #16142 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.11 to 1.32.12.
- [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.11...1.32.12 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
a2b3a5f42b
Bump marky from 1.2.1 to 1.2.2 ( #16147 )
...
Bumps [marky](https://github.com/nolanlawson/marky ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/nolanlawson/marky/releases )
- [Commits](https://github.com/nolanlawson/marky/compare/v1.2.1...v1.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
60446ddd4f
Bump sidekiq-unique-jobs from 7.0.8 to 7.0.9 ( #16139 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.8 to 7.0.9.
- [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.8...v7.0.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
c5c46dd6ee
Fix "cb is not a function" error in streaming API server ( #16134 )
...
Third argument of `ping` is the callback
Regression from #15932
3 years ago
aafe65a142
Change log level of worker start/end to warn in streaming API ( #16110 )
3 years ago
f627d2eb93
Fix trying to fetch key from empty URI when verifying HTTP signature ( #16100 )
3 years ago
422df9d670
Fix cache redis not being used ( #16131 )
3 years ago
7da104eb11
templates/systemd/mastodon: optimize SystemCallFilters ( #16127 )
3 years ago
0bc909687a
Fix typo in db.rake ( #16126 )
...
occured -> occurred
3 years ago
d0fc69d721
Further improve the media attached status query for accounts ( #16106 )
3 years ago
f78cbc0c32
Fix thread resolve worker retrying when status no longer exists ( #16109 )
3 years ago
c4deca6a21
Bump redux from 4.0.5 to 4.1.0 ( #16117 )
...
Bumps [redux](https://github.com/reduxjs/redux ) from 4.0.5 to 4.1.0.
- [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.5...v4.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
d4d19706f8
Bump rubocop from 1.12.1 to 1.13.0 ( #16115 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.12.1 to 1.13.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.12.1...v1.13.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
588c6978d3
Bump @testing-library/jest-dom from 5.11.10 to 5.12.0 ( #16113 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.10 to 5.12.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.10...v5.12.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
06d2bfc8b2
Bump redis from 3.1.1 to 3.1.2 ( #16121 )
...
Bumps [redis](https://github.com/NodeRedis/node-redis ) from 3.1.1 to 3.1.2.
- [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.1...v3.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
9a31c5999a
Bump react-redux from 7.2.3 to 7.2.4 ( #16122 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.2.3 to 7.2.4.
- [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.2.3...v7.2.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
3 years ago
Claire