804 Commits (75279377583c6e2aa04cc8d7380c593979630b38)

Author	SHA1	Message	Date
Claire	c79a03b319	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.	3 years ago
Eugen Rochko	4bdce2c513	Bump version to 3.5.0rc1 (#17618) ... * Bump version to 3.5.0rc1 * Various fixes and improvements * Update AUTHORS.md * Various fixes and improvements * Update README.md	3 years ago
Claire	bb9a6fb5c2	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	642528f455	Update fix-duplicates maintenance task (#17731) ... * Update fix-duplicates task to 2022_02_10_153119 Also add support for Appeal to AccountMerging#merge_with! * Update fix-duplicates task to 2022_03_07_094650 * Update fix-duplicates task to 2022_03_09_213005 * Update fix-duplicates task to 2022_03_07_083603 * Update fix-duplicates task to 2022_03_10_060626 * Update fix-duplicates script to 2022_03_07_083603 * Update fix-duplicates task to 2022_03_10_060706 * Update fix-duplicates task to 2022_03_10_060959 * Silence CodeClimate	3 years ago
Eugen Rochko	75e33fd08f	Fix null values being included in some indexes (#17711) ... * Fix null values being included in some indexes * Update lib/mastodon/migration_helpers.rb Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Add documentation link to corruption error message Co-authored-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	1fbd1fa5c4	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.	3 years ago
Claire	61ae6b3535	Add more migration tests (#17710) ... * Add migration tests for hide_network settings migration * Add tests about suspended/suspended_at * Add more tests regarding the results of migrations * Fix migration test regarding stale conflicting remote account * Add migration tests about AccountConversation	3 years ago
Rens Groothuijsen	c439e13e12	Enable importing GIF emojis in CLI (#17706)	3 years ago
Josh Soref	b5329e0035	Spelling (#17705) ... * spelling: account Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: affiliated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: appearance Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: autosuggest Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: cacheable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: component Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: conversations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: domain.example Clarify what's distinct and use RFC friendly domain space. Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: environment Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: exceeds Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: functional Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: inefficiency Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: not Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: notifications Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: occurring Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: position Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: progress Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: promotable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: reblogging Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: repetitive Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: resolve Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: saturated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: similar Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: strategies Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: success Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: targeting Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: thumbnails Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unauthorized Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unsensitizes Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: validations Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: various Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>	3 years ago
Claire	3d25fe0426	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.	3 years ago
Jeong Arm	3e12abc1fe	Calculate max_id without random vector (#17623)	3 years ago
Claire	954e052b07	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/media_attachment.rb`: Upstream moved hardcoded values around, while in glitch-soc they are configurable. Moved them like upstream, but keeping glitch-soc's ability to configure them through env vars.	3 years ago
Claire	166f6e4b50	Fix some media attachments being converted with too high framerates (#17619) ... Video files with variable framerates are converted to constant framerate videos and the output framerate picked by ffmpeg is based on the original file's container framerate (which can be different from the average framerate). This means that an input video with variable framerate with about 30 frames per second on average, but a maximum of 120 fps will be converted to a constant 120 fps file, which won't be processed by other Mastodon servers. This commit changes it so that input files with VFR and a maximum framerate above the framerate threshold are converted to VFR files with the maximum frame rate enforced.	3 years ago
Claire	692963d43b	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	b6d7726ecb	Remove language detection through cld3 (#17478) ... * Remove language detection through cld3 * Update app/helpers/languages_helper.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Eugen Rochko	3413f1c44b	Forward-port version bump to 3.4.6 (#17434)	3 years ago
Claire	2beb0a7af5	Bump version to 3.4.6	3 years ago
Claire	098f2bc1e1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	54581d43e7	Bump version to 3.4.5 (#17402)	3 years ago
Claire	2fcf652fff	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	a0e06c3c3e	Add more advanced migration tests (#17393) ... - populate the database with some data when testing migrations - try both one-step and two-step migrations (`SKIP_POST_DEPLOYMENT_MIGRATIONS`)	3 years ago
Claire	c6b291afc3	Change index corruption warning to be a little less scary (#17395)	3 years ago
Claire	a99adeaad3	Fix edge case in migration helpers that caused crash because of PostgreSQL quirks (#17398)	3 years ago
Claire	61ef81c548	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.	3 years ago
Claire	8a07ecd377	Remove leftover database columns from Devise::Models::Rememberable (#17191) ... * Remove leftover database columns from Devise::Models::Rememberable * Update fix-duplication maintenance script * Improve errors/warnings in the fix-duplicates maintenance script	3 years ago
Claire	1e8c885e5a	Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338) ... Fixes #17297	3 years ago
Claire	09c61e1376	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: We have completely different contents. Kept our version. - `package.json`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `streaming/index.js`: Conflict due to code style changes on parts that were modified in glitch-soc to handle local-only toots. Changed style according to upstream.	3 years ago
Eugen Rochko	fe71548844	Fix warnings on Rails boot (#16946)	3 years ago
Claire	d4f315f304	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	76761d5fc0	Add ability for admins to delete canonical email blocks (#16644) ... * Add admin option to remove canonical email blocks from a deleted account * Add tootctl canonical_email_blocks to inspect and remove canonical email blocks	3 years ago
Claire	b2526316f5	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.	3 years ago
Takeshi Umeda	6c8c031bcd	Add remove orphans to tootctl statuses remove (#17067) ... * Add remove orphans to tootctl statuses remove * Add REINDEX and change option from vacuum to compression-database * Changed to extract the deletion target of conversations to a temporary table * Support progress bar and exceptions when media remove * Add continue option * Fix compression to compress * Remove skip_remove_orphans	3 years ago
Claire	9b861d56a9	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.	3 years ago
Takeshi Umeda	0ac7efdc50	Fix performance of tootctl statuses remove (#17052) ... * Fix performance of tootctl statuses remove * Fix model class	3 years ago
Takeshi Umeda	06631fdc53	Fix ElasticSearch to Elasticsearch (#17050)	3 years ago
OSAMU SATO	53aca8aecf	Add batch_size option to bin/tootctl search deploy (#17049)	3 years ago
Claire	443ec4f8ba	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`	3 years ago
Eugen Rochko	6e50134a42	Add trending links (#16917) ... * Add trending links * Add overriding specific links trendability * Add link type to preview cards and only trend articles Change trends review notifications from being sent every 5 minutes to being sent every 2 hours Change threshold from 5 unique accounts to 15 unique accounts * Fix tests	3 years ago
Claire	2b4c7beb73	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Takeshi Umeda	3419d3ec84	Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) ... * Bump chewy from 5.2.0 to 7.2.2 * fix style (codeclimate) * fix style * fix style * Bump chewy from 7.2.2 to 7.2.3	3 years ago
Claire	48f8658d34	Fix upload of remote media with OpenStack Swift sometimes failing (#16998) ... Under certain conditions, files fetched from remotes trigger an error when being uploaded using OpenStack Swift. This is because in some cases, the remote server will not return a content-length, so our ResponseWithLimitAdapter will hold a `nil` value for `#size`, which will lead to an invalid value for the Content-Length header of the Swift API call. This commit fixes that by taking the size from the actually-downloaded file size rather than the upstream-provided Content-Length header value.	3 years ago
Claire	2cda8be805	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	18b885ee3a	Fix "bundle exec rails mastodon:setup" crashing in some circumstances (#16976) ... Fix regression from #16896	3 years ago
Eugen Rochko	2251db42ec	Forward port version bumps to 3.4.2 and 3.4.3 (#16945) ... * Bump version to 3.4.2 * Bump version to 3.4.3	3 years ago
Claire	4bb6b1a1e7	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Jeong Arm	884c60002e	Skip blocked domains media on tootctl media refresh (#16914)	3 years ago
Claire	e855df149b	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.	3 years ago
Claire	5ba46952af	Fix mastodon:setup to take dotenv/docker-compose differences into account (#16896) ... In order to work around https://github.com/mastodon/mastodon/issues/16895, add a warning to .env.production.sample, and change the mastodon:setup rake task to: - output a warning if a variable will be interpreted differently by dotenv and docker-compose - ensure the printed config is compatible with docker-compose	3 years ago
Claire	6ba8bc45cb	Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues (#16866) ... Fixes #16822	3 years ago
Claire	b2eaf5562d	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some documentation in the README, but our README is pretty different and barebone. Kept our README.	3 years ago
Claire	694c073d1f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.	3 years ago
Jeong Arm	3f5f4273b3	Add optional domain restrict to tootctl accounts cull (#16511) ... * Add optional domain restrict to accounts cull * Use "unless" - codeclimate	3 years ago
Claire	a8ef6d24d8	Fix `tootctl accounts cull` not excluding domains on timeouts and certificate issues (#16433) ... Fixes #16410	3 years ago
Claire	959f7fc580	Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688) ... * Do not block existing users' emails on self-destruct That is wasteful and unintuitive * Do not close registrations when running tootctl self-destruct with --dry-run * Close registrations on self-destruct regardless of known remote accounts * Fix tootctl self-destruct not sending Deletes for recently-suspended accounts * Suspend local users even if no remote account is known * Do not show scary confirmation text if ran with --dry-run	3 years ago
Claire	29b5c5f483	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Slight refactor upstream, next to a line that was different in glitch-soc because of our local configurable limits on custom emoji size. Ported upstream changes. - `yarn.lock`: Not really a conflict, upstream dependency textually too close to a glitch-soc-only dependency. Updated upstream dependency as upstream.	3 years ago
Claire	fc3ae1343d	Switch from unmaintained paperclip to kt-paperclip (#16724) ... * Switch from unmaintained paperclip to kt-paperclip * Drop some compatibility monkey-patches not required by kt-paperclip * Drop media spoof check monkey-patching It's broken with kt-paperclip and hopefully it won't be needed anymore * Fix regression introduced by paperclip 6.1.0 * Do not rely on pathname to call FastImage * Add test for ogg vorbis file with cover art * Add audio/vorbis to the accepted content-types This seems erroneous as this would be the content-type for a vorbis stream without an ogg container, but that's what the `marcel` gem outputs, so… * Restore missing for_as_default method * Refactor Attachmentable concern and delay Paperclip's content-type spoof check Check for content-type spoofing *after* setting the extension ourselves, this fixes a regression with kt-paperclip's validations being more strict than paperclip 6.0.0 and rejecting some Pleroma uploads because of unknown extensions. * Please CodeClimate * Add audio/vorbis to the unreliable set It doesn't correspond to a file format and thus has no extension associated.	3 years ago
Claire	8ec4be4233	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.	3 years ago
Claire	4ac78e2a06	Add feature to automatically delete old toots (#16529) ... * Add account statuses cleanup policy model * Record last inspected toot to delete to speed up successive calls to statuses_to_delete * Add service to cleanup a given account's statuses within a budget * Add worker to go through account policies and delete old toots * Fix last inspected status id logic All existing statuses older or equal to last inspected status id must be kept by the current policy. This is an invariant that must be kept so that resuming deletion from the last inspected status remains sound. * Add tests * Refactor scheduler and add tests * Add user interface * Add support for discriminating based on boosts/favs * Add UI support for min_reblogs and min_favs, rework UI * Address first round of review comments * Replace Snowflake#id_at_start with with_random parameter * Add tests * Add tests for StatusesCleanupController * Rework settings page * Adjust load-avoiding mechanisms * Please CodeClimate	3 years ago
Takeshi Umeda	818e0b314f	Fix unsupported video error message handling (#16581)	3 years ago
Claire	fc500a6062	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.	4 years ago
Claire	5a1e072517	Change references to tootsuite/mastodon to mastodon/mastodon (#16491) ... * Change references to tootsuite/mastodon to mastodon/mastodon * Remove obsolete test fixture * Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG And a few other places	4 years ago
Claire	3160e050a9	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.	4 years ago
Eugen Rochko	771c9d4ba8	Add ability to skip sign-in token authentication for specific users (#16427) ... Remove "active within last two weeks" exception for sign in token requirement Change admin reset password to lock access until the password is reset	4 years ago
Claire	2e0eac71dd	Add --by-uri option to `tootctl domains purge` (#16434) ... Fixes #16410	4 years ago
Claire	0157caacef	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	f6088922c0	Update emoji codepoint mappings to v13.1 (#16352)	4 years ago
Eugen Rochko	d6486c969f	Bump version to 3.4.1 (#16350)	4 years ago
Claire	11d3c065a5	Fix migration script not being able to run if it fails midway (#16312) ... * Fix migration script not being able to run if it fails midway * Fix old migration script * Fix old migration script * Refactor CorruptionError	4 years ago
Claire	526332c545	Fix account deletion sometimes failing because of optimistic locks (#16317) ... * Fix account deletion sometimes failing because of optimistic locks In some rare occasions[1], deleting accounts would fail with a `StaleObjectError` exception. Indeed, account deletion manually sets the `AccountStat` values without handling cases where the optimistic locking on `AccountStat` would fail. To my knowledge, with the rewrite of account counters in #15913, the `DeleteAccountService` is now the only place that changes the counters in a way that is not atomic. Since in this specific case, we do not care about the previous values of the account counters, it appears we don't need locking at all for this table anymore. [1]: https://discourse.joinmastodon.org/t/account-cant-be-deleted/3602 * Bump MAX_SUPPORTED_VERSION in maintenance script	4 years ago
Claire	abf4c2ab21	Fix `tootctl search deploy` on Ruby 3 (#16346) ... Fixes #16344	4 years ago
Claire	69737b703a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.	4 years ago
Eugen Rochko	4c7efdba40	Bump version to 3.4.0 (#16239)	4 years ago
Eugen Rochko	d862728ae1	Add more checks to `repo:check_locales_files` (#16249)	4 years ago
Claire	76064e6608	Update fix-duplicates maintenance script to support latest migrations (#16231) ... * Update maintenance script to support latest database migrations * Update Account#merge_with!	4 years ago
Claire	dc58d02192	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
rinsuki	5ed5f62705	Fix animated GIF generates animated thumbnail (#16216)	4 years ago
Eugen Rochko	7bd2b54a46	Bump version to 3.4.0rc2 (#16206)	4 years ago
Claire	87c3a0d0b3	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Takeshi Umeda	9b18914c35	Add a Redis environment variable for sidekiq (#16188)	4 years ago
Eugen Rochko	d1442a06c3	Bump version to 3.4.0rc1 (#16053)	4 years ago
Claire	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.	4 years ago
Claire	a5f91a11d0	Fix older migrations on Ruby 3 (#16174)	4 years ago
Claire	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	4 years ago
Eugen Rochko	6d9ad30bf8	Fix media redownload worker retrying on unexpected response codes (#16111)	4 years ago
Eugen Rochko	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	4 years ago
Takeshi Umeda	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	4 years ago
Takeshi Umeda	422df9d670	Fix cache redis not being used (#16131)	4 years ago
Ikko Ashimine	0bc909687a	Fix typo in db.rake (#16126) ... occured -> occurred	4 years ago
Claire	e2a2bc9021	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
Claire	e78d06eecf	Add border to 🚲 emoji (#16035)	4 years ago
Eugen Rochko	ad61265268	Remove dependency on pluck_each gem (#16012)	4 years ago
Claire	c901ae77d4	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
abcang	ddabbbf5a6	Fix DB connection pool settings in CLI (#15983)	4 years ago
Claire	15efa32cca	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Stanislas	d33351af3c	tootctl emoji import: case insensitive duplicate check (#15738)	4 years ago
Claire	f60c99a8fb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	cbd0ee1d07	Update Mastodon to Rails 6.1 (#15910) ... * Update devise-two-factor to unreleased fork for Rails 6 support Update tests to match new `rotp` version. * Update nsa gem to unreleased fork for Rails 6 support * Update rails to 6.1.3 and rails-i18n to 6.0 * Update to unreleased fork of pluck_each for Ruby 6 support * Run "rails app:update" * Add missing ActiveStorage config file * Use config.ssl_options instead of removed ApplicationController#force_ssl Disabled force_ssl-related tests as they do not seem to be easily testable anymore. * Fix nonce directives by removing Rails 5 specific monkey-patching * Fix fixture_file_upload deprecation warning * Fix yield-based test failing with Rails 6 * Use Rails 6's index_with when possible * Use ActiveRecord::Cache::Store#delete_multi from Rails 6 This will yield better performances when deleting an account * Disable Rails 6.1's automatic preload link headers Since Rails 6.1, ActionView adds preload links for javascript files in the Links header per default. In our case, that will bloat headers too much and potentially cause issues with reverse proxies. Furhermore, we don't need those links, as we already output them as HTML link tags. * Switch to Rails 6.0 default config * Switch to Rails 6.1 default config * Do not include autoload paths in the load path	4 years ago
Claire	82556834cf	Change mastodon:setup to not call assets:precompile in docker (#13942) ... It appears assets are built during image build, and they shouldn't need to be rebuilt, since we now have reproducible builds.	4 years ago
Claire	3ad6ef72cb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	741d0952b1	Improve account counters handling (#15913) ... * Improve account counters handling * Use ActiveRecord::Base::sanitize_sql to pass values instead of interpolating them Keep using string interpolation for `key` as it is safe and using “ActiveRecord::Base::sanitize_sql_hash_for_assignment” would require stitching bits of SQL in a way that is not more easily checked for safety. * Add migration hook to catch PostgreSQL versions earlier than 9.5	4 years ago