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
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
18cbce92f8
v4.0.2+1.1.3
2023-01-11 23:52:03 +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
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
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
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
Claire
d587a268fd
Add logging for Rails cache timeouts ( #21667 )
...
* Reduce redis cache store connect timeout from default 20 seconds to 5 seconds
* Log cache store errors
2022-11-27 20:37:37 +01:00
0897c13799
v4.0.2+1.0.5
2022-11-26 14:42:36 +01:00
f34d3b838e
Merge remote-tracking branch 'upstream/main' into develop
2022-11-26 14:02:07 +01:00
41ce71cc92
Merge remote-tracking branch 'upstream/main' into develop
2022-11-23 22:54:06 +01:00
1381fb355c
v4.0.2+1.0.2
2022-11-19 10:22:49 +01:00
874d4a2585
v4.0.2+1.0.1
2022-11-17 23:40:56 +01:00
82e063ac6c
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-11-16 17:43:21 +01:00
Claire
1901829f9a
Merge branch 'main' into glitch-soc/merge-upstream
...
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.
2022-11-16 08:30:00 +01:00
6d5a8d89d1
4.0.1+1.0.4
2022-11-15 08:04:40 +01:00
Eugen Rochko
03b0f3ac83
Bump version to 4.0.2 ( #20725 )
2022-11-15 03:57:18 +01:00
4b56353f13
Merge remote-tracking branch 'upstream/main' into develop
2022-11-15 00:34:05 +01:00
0005e01aa6
4.0.1+1.0.2
2022-11-14 22:52:11 +01:00
