fef
b9afe72a3a
merge with catstodon/main v1.1.0
2022-12-17 16:15:16 +00: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
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
fef
1abd4ba866
bump to nyastodon 1.1.9
2022-12-11 23:24:20 +00:00
fef
5b69f3db10
merge catcatnya/main into main
2022-12-11 23:23:31 +00: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
fef
e0c55d6043
bump to nyastodon 1.1.8
2022-12-09 15:02:09 +00:00
fef
380567f453
merge catstodon/main into main
2022-12-09 15:01:00 +00:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop
2022-12-07 17:49:14 +01:00
fef
ea10eabad6
merge catstodon/main into main
2022-12-07 13:22:33 +00: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
Jeremy Kescher
8a24bef2e3
Fix Redis warnings regarding version 5.0.0
2022-12-04 22:35:48 +01:00
Jeremy Kescher
3520ebbd3b
v4.0.2+1.0.10
2022-12-04 21:52:49 +01:00
Jeremy Kescher
9554a005cd
v4.0.2+1.0.9
2022-12-04 20:58:04 +01:00
fef
fec439df28
bump to nyastodon 1.1.7
2022-12-03 17:56:35 +00:00
fef
c501a17b1f
merge catstodon/main into main
2022-12-02 01:41:43 +00:00
fef
fdc8dce395
bump to nyastodon 1.1.6
2022-12-02 01:07:17 +00:00
Jeremy Kescher
32600375b3
Merge remote-tracking branch 'upstream/main' into develop
2022-12-01 20:57:06 +01:00
fef
58145e775f
bump to nyastodon 1.1.5
2022-12-01 02:58:57 +00:00
fef
ca4df02956
merge catcatnya/main into main
2022-12-01 02:53:26 +00:00
Jeremy Kescher
bbbf5f1746
Upgrade ruby dependencies
2022-11-30 18:06:14 +01:00
fef
57e46f4aaf
merge catstodon/main into main
2022-11-30 16:35:05 +00:00
fef
4489c51bb9
bump to nyastodon 1.1.4
2022-11-30 16:30:42 +00:00
fef
ddeda89821
bump to nyastodon 1.1.3
2022-11-29 05:38:15 +00:00
fef
4e041d1e00
bump to nyastodon 1.1.2
2022-11-29 04:38:41 +00:00
fef
7f157c35cf
bump to nyastodon 1.1.1
2022-11-29 03:32:54 +00:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6
2022-11-29 00:15:08 +01:00
fef
0157438894
merge catcatnya/main into main
2022-11-28 22:47:46 +00:00
fef
1a84936322
bump to nyastodon 1.1.0
2022-11-28 22:47:32 +00: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
098ced7420
Remove support for Ruby 2.6 ( #21477 )
...
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.
2022-11-27 20:41:39 +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
Jeremy Kescher
0897c13799
v4.0.2+1.0.5
2022-11-26 14:42:36 +01:00
Jeremy Kescher
f34d3b838e
Merge remote-tracking branch 'upstream/main' into develop
2022-11-26 14:02:07 +01:00
fef
1bfdff6795
bump to nyastodon 1.1.0-beta2
2022-11-25 23:12:19 +00:00
fef
7b4f3d2647
bump to nyastodon 1.1.0beta1
2022-11-24 17:34:45 +00:00
fef
8380f9fc2c
merge catstodon/main into main
2022-11-24 05:55:08 +00:00
Jeremy Kescher
41ce71cc92
Merge remote-tracking branch 'upstream/main' into develop
2022-11-23 22:54:06 +01:00
fef
1b7839f00a
merge catcatnya/main into main
2022-11-20 22:49:50 +00:00
fef
1792b688ac
bump to nyastodon 1.0.3
2022-11-20 22:46:00 +00:00
Jeremy Kescher
1381fb355c
v4.0.2+1.0.2
2022-11-19 10:22:49 +01:00
