mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-04 09:49:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17491 commits 5 branches 147 tags 265 MiB
Commit graph

623 commits

Author SHA1 Message Date
Jeremy Kescher
88d22463d9
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	config/sidekiq.yml
 2023-02-21 00:53:40 +01:00
Jeremy Kescher
0e634397c3
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
 2023-02-21 00:40:08 +01:00
Claire
7452a95998 Merge branch 'main' into glitch-soc/merge-upstream 
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-19 10:42:55 +01:00
Nick Schonning
81ad6c2e39
Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
Nick Schonning
2177daeae9
Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	config/sidekiq.yml
 2023-02-18 22:38:53 +01:00
Nick Schonning
ab7816a414
Autofix Rubocop Style/Lambda (#23696) 2023-02-18 12:39:00 +01:00
Nick Schonning
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
Nick Schonning
e2567df860
Enable Lint/RedundantCopDisableDirective (#23687) 2023-02-18 04:30:14 +01:00
Nick Schonning
ac59d6f19f
Enable Rubocop Style/NumericLiterals (#23647) 2023-02-18 11:05:57 +09:00
Jeremy Kescher
6ef68d4106
Update and fix dependencies 2023-02-17 00:29:06 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
#	app/javascript/flavours/glitch/actions/interactions.js
#	config/initializers/rack_attack.rb
#	config/locales/en_GB.yml
 2023-02-17 00:26:21 +01:00
Claire
87419f9307 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00
Claire
70c0d754a6
Bump version to 4.1.0 (#23471) 
* Bump version to 4.1.0

* Editorialize changelog some more and highlight API changes

* Update changelog
 2023-02-10 22:21:23 +01:00
Claire
85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
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-09 12:46:12 +01:00
Nick Schonning
11557d1c5a
Apply Rubocop Rails/RootPublicPath (#23447) 2023-02-08 10:38:07 +01:00
Nick Schonning
203739dd3a
Apply Rubocop Performance/StringIdentifierArgument (#23444) 2023-02-08 02:36:20 +01:00
Claire
aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream 
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-03 19:23:27 +01:00
Claire
79ca19e9b2
Bump version to 4.1.0rc3 (#23384) 2023-02-03 16:39:38 +01:00
Jeremy Kescher
27fdb81b65
Merge remote-tracking branch 'upstream/main' into develop 2023-01-27 00:36:49 +01:00
Jeremy Kescher
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
Jeremy Kescher
44e4991a07
PgHero CVE fix 
Backport of 9b795a25cd
 2023-01-23 08:29:54 +01:00
Jeremy Kescher
a48a289df7
v4.0.2+1.1.6 2023-01-22 11:34:39 +01:00
Jeremy Kescher
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
Jeremy Kescher
bf5076e970
Update a few gems 2023-01-18 22:33:07 +01:00
Jeremy Kescher
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
Jeremy Kescher
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
Jeremy Kescher
18cbce92f8
v4.0.2+1.1.3 2023-01-11 23:52:03 +01:00
Jeremy Kescher
f862d584a7
redis_config.rb: Move away deprecated Sidekiq config syntax 2023-01-06 00:17:36 +01:00
Jeremy Kescher
0dfa8d73d7
v4.0.2+1.1.12 2023-01-05 23:30:18 +01:00
Jeremy Kescher
eded36676f
Fix status reactions preventing an on_cascade delete 2022-12-18 04:20:05 +01:00
Jeremy Kescher
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
Jeremy Kescher
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
Jeremy Kescher
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
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop 2022-12-07 17:49:14 +01:00