| Age | Commit message (Collapse) | Author |
|---|
|
|
|
* Bump version to 4.1.0
* Editorialize changelog some more and highlight API changes
* Update changelog
|
|
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.
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
* 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
|
|
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.
|
|
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
|
|
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Upstream removed a line close to one modified by glitch-soc.
Removed the line as upstream did.
|
|
* Implement tootctl accounts prune
* Optimise query
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
|
* Add tootctl accounts replay-migration
Fixes #22281
* Change `tootctl accounts replay-migration` to `tootctl accounts migrate`
|
|
|
|
Regression from #23012
|
|
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.
|
|
(#22558)
|
|
`mastodon:setup` (#23012)
* Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup`
* Improve robustness of dotenv escaping
|
|
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`
|
|
|
|
Conflicts:
- `README.md`:
Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
Port upstream's minor refactoring
|
|
s3-us-east-1.amazonaws.com does not exist.
Co-authored-by: Effy Elden <effy@effy.space>
|
|
|
|
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>
|
|
|
|
|
|
|
|
|
|
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.
|
|
* Fix BackfillAdminActionLogs post-deployment migration
* Improve migration tests
* Backfill admin action logs again
|
|
Conflicts:
- `README.md`:
Our README is completely different.
Discarded upstream changes.
|
|
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.
|
|
* Reduce redis cache store connect timeout from default 20 seconds to 5 seconds
* Log cache store errors
|
|
Conflicts:
- `config/initializers/content_security_policy.rb`:
Our config file is pretty different from upstream.
Upstream changed CSP directive `script-src` to include
`wasm-unsafe-eval` instead of `unsafe-eval`, which we
did not include.
Added `wasm-unsafe-eval` to `script-src` to fix
execution of the OCR web worker.
- `package.json`:
Upstream updated a dependency (`array-includes`) textually
adjacent to a glitch-soc-only dependency (`atrament`).
Updated `array-includes` as upstream did.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
|
|
|
|
Fix #19156
|
|
Fixes #19133
|
