Merge mastodon v4.0.6 #1502
Merged
Merge mastodon v4.0.6 #1502
+59,681
−38,085
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Improve tests - Fix possible crash when application of a reblogged post isn't set - Fix discrepancies around favourited and reblogged attributes - Fix discrepancies around pinned attribute - Fix polls not being hydrated
* Spare one SQL query when hydrating polls * Improve tests * Fix more discrepancies * Fix possible crash when the status has no application set
* New translations en.json (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Armenian) * New translations en.yml (Irish) * New translations en.json (Thai) * New translations en.json (Sinhala) * New translations en.json (Bulgarian) * New translations en.json (Ido) * New translations en.json (German) * New translations en.json (Tamil) * New translations en.json (Esperanto) * New translations en.json (Czech) * New translations en.json (Dutch) * New translations en.json (Albanian) * New translations en.json (Japanese) * New translations en.json (Indonesian) * New translations en.json (Romanian) * New translations en.json (Irish) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Afrikaans) * New translations en.json (Arabic) * New translations en.json (Catalan) * New translations en.json (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Corsican) * New translations en.json (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Occitan) * New translations en.json (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Sardinian) * New translations en.json (Breton) * New translations en.json (Sanskrit) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations activerecord.en.yml (Spanish, Mexico) * New translations en.json (Burmese) * New translations en.json (Cornish) * New translations en.json (Malayalam) * New translations en.json (Persian) * New translations en.json (Estonian) * New translations en.json (Spanish, Argentina) * New translations en.json (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.json (Marathi) * New translations en.json (Croatian) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Kazakh) * New translations en.json (Latvian) * New translations en.json (Tatar) * New translations en.json (Hindi) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (English, United Kingdom) * New translations en.json (Welsh) * New translations en.json (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Japanese) * New translations en.json (Finnish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.json (Portuguese) * New translations en.json (Chinese Simplified) * New translations en.json (Spanish, Argentina) * New translations en.json (Irish) * New translations en.json (Irish) * New translations doorkeeper.en.yml (Irish) * New translations activerecord.en.yml (Irish) * New translations devise.en.yml (Irish) * New translations en.json (Greek) * New translations en.json (Irish) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Chinese Traditional) * New translations en.json (Galician) * New translations en.json (French) * New translations en.yml (French) * New translations en.json (Italian) * New translations en.json (Vietnamese) * New translations en.json (Latvian) * New translations simple_form.en.yml (Korean) * New translations en.json (Esperanto) * New translations en.json (Albanian) * New translations en.json (Indonesian) * New translations en.json (Icelandic) * New translations en.yml (Indonesian) * New translations en.json (Norwegian Nynorsk) * New translations en.yml (Norwegian Nynorsk) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.json (Slovenian) * New translations en.json (Turkish) * New translations en.json (Vietnamese) * New translations en.yml (Norwegian Nynorsk) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (German) * New translations simple_form.en.yml (Finnish) * New translations en.json (Hungarian) * New translations en.yml (Hungarian) * New translations en.json (Breton) * New translations en.json (Dutch) * New translations en.json (Spanish) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Hungarian) * New translations en.json (French) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Slovak) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Afrikaans) * New translations en.json (Catalan) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Indonesian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations en.json (Persian) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Italian) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Ukrainian) * New translations en.json (Irish) * New translations simple_form.en.yml (Dutch) * New translations en.json (Ukrainian) * New translations activerecord.en.yml (Irish) * New translations en.json (Polish) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Dutch) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Swedish) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Swedish) * New translations doorkeeper.en.yml (Swedish) * New translations activerecord.en.yml (Swedish) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Swedish) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Afrikaans) * New translations en.yml (Afrikaans) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Norwegian Nynorsk) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Korean) * New translations en.json (Norwegian Nynorsk) * New translations en.yml (Swedish) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Polish) * New translations en.json (Swedish) * New translations en.yml (Swedish) * New translations simple_form.en.yml (Icelandic) * New translations en.json (Czech) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* Fix compose form submission reloading web interface Fix regression introduced by mastodon#19742 * Fix various compose form buttons being handled like submit buttons * Fix coding style issue * Fix missing onClick prop check
The link https://app.intigriti.com/programs/mastodon/mastodonio/detail no longer works * Closes mastodon#19491 Signed-off-by: Yarden Shoham <hrsi88@gmail.com> Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
mastodon#19803) New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
Currently building on Heroku fails with a package error for libidn11. Since Mastodon uses idn-ruby 0.1.2 we should upgrade to libidn12
* version emoji-mart * add lock file
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Tighten allowed HTML in oEmbed-based preview cards * Sanitize preview cards at render time * Add `sandbox` attribute to preview card iframes
* Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged
* Fix timeout handling of outbound HTTP requests * Use CLOCK_MONOTONIC instead of Time.now
# Conflicts: # .github/workflows/build-image.yml # CHANGELOG.md # Gemfile.lock # app/controllers/api/v1/admin/accounts_controller.rb # app/controllers/auth/sessions_controller.rb # app/javascript/mastodon/components/status.js # app/javascript/mastodon/components/status_content.js # app/javascript/mastodon/features/compose/components/compose_form.js # app/services/activitypub/fetch_remote_account_service.rb # app/services/activitypub/process_account_service.rb # app/services/follow_migration_service.rb # app/services/remove_status_service.rb # app/workers/scheduler/user_cleanup_scheduler.rb # chart/values.yaml # config/application.rb # config/initializers/content_security_policy.rb # config/routes.rb # db/seeds.rb # dist/nginx.conf # docker-compose.yml # lib/mastodon/version.rb # package.json # spec/services/report_service_spec.rb # yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.