855b0d4dbb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2023-01-26 17:27:01 +01:00
Claire
0f4637981b
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-25 17:26:38 +01:00
Claire
2f112432e6
Bump version to 4.1.0rc2 ( #23220 )
2023-01-25 16:20:54 +01:00
44e4991a07
PgHero CVE fix
...
Backport of 9b795a25cd
2023-01-23 08:29:54 +01:00
a48a289df7
v4.0.2+1.1.6
2023-01-22 11:34:39 +01:00
bd30ddd982
Merge remote-tracking branch 'upstream/main' into develop
2023-01-22 11:33:25 +01:00
Claire
3fd3e88b25
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-21 14:58:15 +01:00
Claire
8180f7ba19
Bump version to 4.1.0rc1 ( #23112 )
2023-01-20 14:19:12 +01:00
bf5076e970
Update a few gems
2023-01-18 22:33:07 +01:00
0d829dadea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/features/ui/index.js
# app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
JT Olio
a5fd2fe1cb
Add Storj DCS to cloud object storage options ( #21929 )
...
* 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-18 17:47:49 +01:00
Claire
60abcb3c4c
Merge branch 'main' into glitch-soc/merge-upstream
...
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-18 17:38:11 +01:00
Claire
cb4e28f405
Add tootctl domains purge options to select subdomains and keep domain 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-18 16:50:50 +01:00
004b2fc290
Merge remote-tracking branch 'upstream/main' into develop
2023-01-15 20:38:42 +01:00
Claire
ab59743c13
Merge branch 'main' into glitch-soc/merge-upstream
...
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-14 22:34:09 +01:00
Jeong Arm
0e8f8a1a1c
Implement tootctl accounts prune ( #18397 )
...
* Implement tootctl accounts prune
* Optimise query
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13 22:34:16 +01:00
Claire
745bdb11a0
Add tootctl accounts migrate ( #22330 )
...
* Add tootctl accounts replay-migration
Fixes #22281
* Change `tootctl accounts replay-migration` to `tootctl accounts migrate`
2023-01-13 17:00:23 +01:00
Claire
b52dc5f69d
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-13 10:31:52 +01:00
Claire
a3a5aa1597
Fix incorrect env file generation in mastodon:setup ( #23072 )
...
Regression from #23012
2023-01-13 10:17:07 +01:00
Claire
3e63fcd4f0
Merge branch 'main' into glitch-soc/merge-upstream
...
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-12 10:15:46 +01:00
18cbce92f8
v4.0.2+1.1.3
2023-01-11 23:52:03 +01:00
Claire
15b88a83ab
Fix sanitizer parsing link text as HTML when stripping unsupported links ( #22558 )
2023-01-11 22:21:10 +01:00
Claire
a65f86ae55
Fix $ not being escaped in .env.production file generated by mastodon:setup ( #23012 )
...
* Fix `$` not being escaped in `.env.production` file generated by `mastodon:setup`
* Improve robustness of dotenv escaping
2023-01-11 21:53:11 +01:00
f862d584a7
redis_config.rb: Move away deprecated Sidekiq config syntax
2023-01-06 00:17:36 +01:00
0dfa8d73d7
v4.0.2+1.1.12
2023-01-05 23:30:18 +01:00
48373a71e3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/components/status_action_bar.js
# app/javascript/flavours/glitch/containers/status_container.js
# app/javascript/flavours/glitch/features/status/components/action_bar.js
# app/javascript/flavours/glitch/locales/de.json
# app/javascript/flavours/glitch/locales/fr.json
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/features/status/components/action_bar.js
# config/locales-glitch/de.yml
# config/locales-glitch/fr.yml
# config/locales-glitch/simple_form.de.yml
# config/locales-glitch/simple_form.fr.yml
2023-01-05 23:29:53 +01:00
Claire
6c20dad201
Merge branch 'main' into glitch-soc/merge-upstream
...
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-05 14:16:25 +01:00
Nick Schonning
558ac411c4
Expand Stylelint glob to include CSS files ( #22469 )
2023-01-05 13:42:13 +01:00
eded36676f
Fix status reactions preventing an on_cascade delete
2022-12-18 04:20:05 +01:00
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2022-12-16 17:53:33 +01:00
Claire
f3a4d57be1
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
Dan Peterson
3d3429243f
Fix default S3_HOSTNAME used in mastodon:setup ( #19932 )
...
s3-us-east-1.amazonaws.com does not exist.
Co-authored-by: Effy Elden <effy@effy.space>
2022-12-15 16:38:51 +01:00
Claire
f239d31f23
Add --email and --dry-run options to tootctl accounts delete ( #22328 )
2022-12-15 14:52:50 +01:00
Evan
78ef635980
Add command to remove avatar and header images of inactive remote accounts 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-14 19:50:07 +01:00
Claire
47c75c29da
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-14 09:10:49 +01:00
Claire
55b210b3e5
Fix crash and incorrect behavior in tootctl domains crawl ( #19004 )
2022-12-13 20:02:32 +01:00
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop
2022-12-09 23:46:41 +01:00
Claire
e877bb47b8
Merge branch 'main' into glitch-soc/main
2022-12-09 16:48:55 +01:00
7e19321520
Merge remote-tracking branch 'upstream/main' into develop
2022-12-07 17:49:14 +01:00
Claire
c52263f6f8
Fix deprecation warning in tootctl accounts rotate ( #22120 )
2022-12-07 14:13:10 +01:00
Claire
9a3d91f629
Merge branch 'main' into glitch-soc/merge-upstream
...
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-07 09:03:42 +01:00
Claire
66a70ebb6e
Fix pre-4.0 admin action logs ( #22091 )
...
* Fix BackfillAdminActionLogs post-deployment migration
* Improve migration tests
* Backfill admin action logs again
2022-12-06 23:38:03 +01:00
8a24bef2e3
Fix Redis warnings regarding version 5.0.0
2022-12-04 22:35:48 +01:00
3520ebbd3b
v4.0.2+1.0.10
2022-12-04 21:52:49 +01:00
9554a005cd
v4.0.2+1.0.9
2022-12-04 20:58:04 +01:00
32600375b3
Merge remote-tracking branch 'upstream/main' into develop
2022-12-01 20:57:06 +01:00
bbbf5f1746
Upgrade ruby dependencies
2022-11-30 18:06:14 +01:00
730a09f642
v4.0.2+1.0.6
2022-11-29 00:15:08 +01:00
Claire
a2e7997592
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README is completely different.
Discarded upstream changes.
2022-11-28 11:33:34 +01:00
