about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2021-05-07Change media modals look in web UIEugen Rochko
Port 1e89e2ed988d2103ecd46e06476d863cb40c57c7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Change home timeline to reload after follow recommendations in web UIEugen Rochko
Port 0ad240cb6b8662e31dfae6279cbee07a4c75b231 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Fix "You might be interested in" flashing while searching in web UIEugen Rochko
Port 0a3fa034fc66246dbf9dfb4627a983e0903042d4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Add empty state message for follow recommendations in web UIEugen Rochko
Port 8d75bd002da5011237b537b522a5b6248e99b9d5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Hide floating action button on onboarding pageClaire
Port 2c322addf378d17b3962b545572a43cc9d36e526 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Change follow recommendations to be limited to 20 instead of 40 in ↵Eugen Rochko
web UI Port 7762d3d27592abe60946ac26a3a2012cd3311fb1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Fix newlines not being considered sentence separators in account noteEugen Rochko
Port b5ac17c4b6bfa85494fd768bbf1af87ca79b622b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] Change onboarding by replacing tutorial with follow recommendations ↵Eugen Rochko
in web UI Port bf903dc51070f952ab64e43918e803fdaaa15e4d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07Disable onboarding modal (keep it in “Show me around” from getting ↵Claire
started menu)
2021-05-07Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-05-07[Glitch] Add joined date to profiles in web UIEugen Rochko
Port 2c77d97e0d59e045a9b04fccc83f0f24d190d8d8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07[Glitch] fix component namefusagiko / takayamaki
Port c35a6b9e01a4f3b4c1dbdb2971187e49ea30096f to glitch-soc Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
- `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.
2021-05-07Do not populate AccountSummaries and FollowRecommendation views on migration ↵Claire
(#16173) Materializing those views can take a while, and they are currently refreshed anyway each time they are actually used, in the FollowRecommendationsScheduler.
2021-05-07Fix older migrations on Ruby 3 (#16174)Claire
2021-05-07Change home timeline to reload after follow recommendations in web UI (#16160)Eugen Rochko
2021-05-07Change trending hashtags to be affected be reblogs (#16164)Eugen Rochko
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
2021-05-07Add joined date to profiles in web UI (#16169)Eugen Rochko
2021-05-07Bump url-parse from 1.4.7 to 1.5.1 (#16172)dependabot[bot]
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>
2021-05-07Bump webpacker from 5.2.1 to 5.3.0 (#16144)dependabot[bot]
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>
2021-05-07Bump devise from 4.7.3 to 4.8.0 (#16140)dependabot[bot]
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>
2021-05-07Bump yargs from 16.2.0 to 17.0.0 (#16149)dependabot[bot]
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>
2021-05-06Add Ruby 3.0 support (#16046)Claire
* 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
2021-05-06Fix "You might be interested in" flashing while searching in web UI (#16162)Eugen Rochko
2021-05-05Add empty state message for follow recommendations in web UI (#16161)Eugen Rochko
2021-05-05Fix media redownload worker retrying on unexpected response codes (#16111)Eugen Rochko
2021-05-05Fix display of toots without text content (#15665)Claire
* 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
2021-05-05Add management of delivery availability in Federation settings (#15771)Takeshi Umeda
* 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)
2021-05-05Improve performance of follow recommendation scheduler (#16159)Claire
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**.
2021-05-05Fix error when trying to render component for media without meta (#16112)Eugen Rochko
2021-05-05Fix database serialization failure returning HTTP 500 (#16101)Eugen Rochko
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
2021-05-05Fix media processing getting stuck on too much stdin/stderr (#16136)Eugen Rochko
* 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
2021-05-05Workaround Resolv::DNS-induced hangs by installing resolv 0.1.0 (#16157)Claire
See https://github.com/tootsuite/mastodon/pull/16154#issuecomment-832062139
2021-05-05Fix how to change connection pool for rails 6 (#16158)Takeshi Umeda
* Fix how to change connection pool for rails 6 * Fix to match the code elsewhere
2021-05-04Improve description of keyboard shortcuts (#16129)Mélanie Chauvel
* Remove useless “to” from shortcuts description * Improve descriptions of keyboard shortcuts * Use curved quotations marks instead of straight ones
2021-05-04Remove dependency for @babel/plugin-proposal-class-properties (#16155)Yamagishi Kazutoshi
2021-05-04Revert default Ruby version to 2.7.2 (#16154)Claire
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
2021-05-04Fix existing username validator not allowing multiple accounts (#16153)Eugen Rochko
Fix #16107
2021-05-04Fix empty home feed before first follow has finished processing (#16152)Eugen Rochko
Change queue of merge worker from pull to default
2021-05-03Change confirmations controller to redirect to / for approved users (#16151)Claire
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.
2021-05-03Bump mini-css-extract-plugin from 1.5.0 to 1.6.0 (#16150)dependabot[bot]
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>
2021-05-03Bump @babel/preset-env from 7.13.15 to 7.14.0 (#16145)dependabot[bot]
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>
2021-05-03fix component name (#16138)fusagiko / takayamaki
It seems forget renaming when It copied from MissingIndicator. Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2021-05-03Bump @babel/runtime from 7.13.17 to 7.14.0 (#16148)dependabot[bot]
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>
2021-05-03Bump aws-sdk-s3 from 1.93.1 to 1.94.0 (#16143)dependabot[bot]
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>
2021-05-03Bump @babel/core from 7.13.16 to 7.14.0 (#16141)dependabot[bot]
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>
2021-05-03Bump sass from 1.32.11 to 1.32.12 (#16142)dependabot[bot]
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>
2021-05-03Bump marky from 1.2.1 to 1.2.2 (#16147)dependabot[bot]
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>
2021-05-03Bump sidekiq-unique-jobs from 7.0.8 to 7.0.9 (#16139)dependabot[bot]
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>
2021-05-02Fix "cb is not a function" error in streaming API server (#16134)Eugen Rochko
Third argument of `ping` is the callback Regression from #15932