about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2023-02-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
2023-02-19Autofix Rubocop Style/StringLiterals (#23695)Nick Schonning
2023-02-19Autofix Rubocop Style/RedundantBegin (#23703)Nick Schonning
2023-02-18Autofix Rubocop Style/Lambda (#23696)Nick Schonning
2023-02-18Autofix Rubocop Style/IfUnlessModifier (#23697)Nick Schonning
2023-02-18Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)Nick Schonning
2023-02-18Enable Lint/RedundantCopDisableDirective (#23687)Nick Schonning
2023-02-18Apply Rubocop Style/RedundantConstantBase (#23463)Nick Schonning
2023-02-18Enable Rubocop Style/NumericLiterals (#23647)Nick Schonning
2023-02-18Run rubocop formatting except line length (#23632)Nick Schonning
2023-02-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.
2023-02-13Upgrade to Stylelint 15 with Prettier (#23558)Nick Schonning
2023-02-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-10Bump version to 4.1.0 (#23471)Claire
* Bump version to 4.1.0 * Editorialize changelog some more and highlight API changes * Update changelog
2023-02-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
2023-02-08Apply Rubocop Rails/RootPublicPath (#23447)Nick Schonning
2023-02-08Apply Rubocop Style/NegatedIfElseCondition (#23451)Nick Schonning
2023-02-08Apply Rubocop Performance/StringIdentifierArgument (#23444)Nick Schonning
2023-02-08Apply Rubocop Performance/BindCall (#23437)Nick Schonning
2023-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.
2023-02-03Bump version to 4.1.0rc3 (#23384)Claire
2023-01-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-25Bump version to 4.1.0rc2 (#23220)Claire
2023-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-20Bump version to 4.1.0rc1 (#23112)Claire
2023-01-18Add Storj DCS to cloud object storage options (#21929)JT Olio
* Add Storj DCS to cloud object storage options More explanation here: https://forum.storj.io/t/object-storage-provider-for-mastodon-instance/11464/37 * more help for which command to use
2023-01-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
2023-01-18Add `tootctl domains purge` options to select subdomains and keep domain ↵Claire
blocks (#22063) * Add --include-subdomains option to tootctl domains purge * Add support for '*.' subdomain wildcard patterns in `tootctl domains purge` * Fix custom emojis deletion not following subdomain and URI options * Change `tootctl domains purge` to not purge domain blocks unless --purge-domain-blocks is passed * Refactor `tootctl domains purge` * Add feedback on deleted domain blocks
2023-01-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.
2023-01-13Implement tootctl accounts prune (#18397)Jeong Arm
* Implement tootctl accounts prune * Optimise query Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13Add `tootctl accounts migrate` (#22330)Claire
* Add tootctl accounts replay-migration Fixes #22281 * Change `tootctl accounts replay-migration` to `tootctl accounts migrate`
2023-01-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-13Fix incorrect env file generation in mastodon:setup (#23072)Claire
Regression from #23012
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.
2023-01-11Fix sanitizer parsing link text as HTML when stripping unsupported links ↵Claire
(#22558)
2023-01-11Fix `$` not being escaped in `.env.production` file generated by ↵Claire
`mastodon:setup` (#23012) * Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup` * Improve robustness of dotenv escaping
2023-01-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05Expand Stylelint glob to include CSS files (#22469)Nick Schonning
2022-12-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
2022-12-15Fix default S3_HOSTNAME used in mastodon:setup (#19932)Dan Peterson
s3-us-east-1.amazonaws.com does not exist. Co-authored-by: Effy Elden <effy@effy.space>
2022-12-15Add --email and --dry-run options to `tootctl accounts delete` (#22328)Claire
2022-12-14Add command to remove avatar and header images of inactive remote accounts ↵Evan
from the local database (#22149) * Add tootctl subcommand media remove-profile-media * Trigger workflows * Correcting external linting * External linting error * External linting fix * Merging with remove command * Linting * Correct long option names Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Correct long option names Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Correct long option names Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Remove saving a list of purged accounts Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-12-13Fix crash and incorrect behavior in tootctl domains crawl (#19004)Claire
2022-12-09Merge branch 'main' into glitch-soc/mainClaire
2022-12-07Fix deprecation warning in `tootctl accounts rotate` (#22120)Claire
2022-12-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
2022-12-06Fix pre-4.0 admin action logs (#22091)Claire
* Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again
2022-11-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
2022-11-27Remove support for Ruby 2.6 (#21477)Claire
As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193 at least one of our dependencies already dropped support for Ruby 2.6, and we had removed Ruby 2.6 tests from the CI over a year ago (#16861). So stop advertising Ruby 2.6 support, bump targeted version, and drop some compatibility code.
generated by cgit-pink (git 2.37.1) at 2024-11-22 15:31:58 +0000