Georg Gadinger
59be64f1d6
Fix "Too many open files" errors when using ElasticSearch
...
This change sets the Faraday adapter used for ElasticSearch to `:net_http`.
The `elasticsearch-transport` gem tries to auto detect a suitable Faraday
adapter. Mastodon uses the Faraday default adapter of `:net_http`, but since
`elasticsearch-transport` sees that the `httpclient` gem is available it lets
Faraday use that one. Unfortunately `httpclient` does not properly clean up
its connections, leading to a lot of established connections to ElasticSearch
over time.
See also: e074fcff9b/lib/elastic/transport/client.rb (L291-L304)https://github.com/mastodon/mastodon/pull/27138 )
2024-01-07 20:05:59 +01:00
Jeremy Kescher
9fd1e79e95
Bump Ruby version to 3.3.0, update CatCatNya~ config
2024-01-05 18:02:05 +01:00
Jeremy Kescher
3b9a52aab6
Merge branch 'glitch-soc' into develop
2024-01-04 17:57:02 +01:00
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop
2024-01-04 17:30:03 +01:00
Claire
dfbf96021e
Merge pull request #2556 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f92d8c654d
2024-01-03 23:45:09 +01:00
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
Claire
0cf9f3200c
Merge pull request #2555 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 092bb8a27a
2024-01-03 19:36:37 +01:00
Jeremy Kescher
42520e72c5
Remove duplicate "Number of visible reactions" setting
2024-01-03 17:55:12 +01:00
Matt Jankowski
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
Claire
905794fd57
Remove v3.5 branch from supported Mastodon versions ( #28574 )
2024-01-03 15:04:10 +00:00
Matt Jankowski
5c769de096
Add spec coverage for CLI::Media#remove_orphans command ( #28267 )
2024-01-03 14:12:56 +00:00
Matt Jankowski
51d2b80ff7
Solve Abc/* metrics for db/*migrate* files ( #28568 )
2024-01-03 13:22:03 +00:00
Matt Jankowski
74a0d81e90
Add coverage for CLI self-destruct command ( #28565 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-03 13:06:38 +00:00
Matt Jankowski
e12d8893f4
Fix intermittent failure from unspecified order in export_domain_blocks controller spec ( #28562 )
2024-01-03 13:06:15 +00:00
Claire
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
Claire
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
2024-01-03 10:23:58 +00:00
github-actions[bot]
7cce2a41f2
New Crowdin Translations (automated) ( #28573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-03 09:19:46 +00:00
renovate[bot]
2b330ede22
Update dependency eslint-plugin-jsdoc to v48 ( #28564 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-03 09:10:19 +00:00
renovate[bot]
8c5d3e5278
Update dependency puma to v6.4.1 ( #28569 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-03 09:05:52 +00:00
renovate[bot]
c2b4588f1c
Update dependency sass to v1.69.7 ( #28570 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-03 09:04:59 +00:00
Claire
5abc965be4
Merge pull request #2554 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3944b12b5e
2024-01-02 20:27:30 +01:00
Jeremy Kescher
bcb25cd49f
doc: Add ES_PRESET to .env.production.catcatnya
2024-01-02 19:33:54 +01:00
Jeremy Kescher
981fd44683
v4.3.0+1.0.0
2024-01-02 19:11:50 +01:00
Claire
48c9192b47
[Glitch] Fix loading local accounts with extraneous domain part in WebUI
...
Port 65ea097f1d
2024-01-02 18:16:57 +01:00
Claire
f685c953e5
Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream
2024-01-02 18:12:28 +01:00
Claire
f62384063c
Merge pull request #2552 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 1184887b01
2024-01-02 17:42:48 +01:00
Claire
b3d871d3a4
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used
...
(backports https://github.com/mastodon/mastodon/pull/28561 )
2024-01-02 17:38:32 +01:00
Matt Jankowski
3944b12b5e
Update @typescript-eslint/parser to version 6.17.0 ( #28218 )
2024-01-02 15:19:54 +00:00
Claire
65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI ( #28559 )
2024-01-02 15:02:25 +00:00
Jeremy Kescher
b18cd3f4bd
fix: check for limited_federation_mode instead of removed whitelist_mode
2024-01-02 13:55:07 +01:00
Michael Stanclift
0cd497ba7d
[Glitch] Fix OCR when using S3/CDN for assets
...
Port fdec8d7ffb
2024-01-02 13:37:04 +01:00
Claire
b3542ac57b
Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our README.
2024-01-02 13:35:11 +01:00
Claire
1184887b01
Fix streaming API redirection ignoring the port of streaming_api_base_url ( #28558 )
2024-01-02 12:27:51 +00:00
Jeremy Kescher
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
2024-01-02 12:16:35 +01:00
renovate[bot]
cd09be054f
Update dependency eslint-plugin-jsdoc to v47 ( #28541 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-02 10:13:22 +00:00
github-actions[bot]
0374e11091
New Crowdin Translations (automated) ( #28529 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-02 09:11:53 +00:00
Michael Stanclift
fdec8d7ffb
Fix OCR when using S3/CDN for assets ( #28551 )
2024-01-02 09:09:54 +00:00
renovate[bot]
1982137590
Update dependency classnames to v2.5.1 ( #28524 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-02 08:52:09 +00:00
renovate[bot]
c2340682aa
Update babel monorepo to v7.23.7 ( #28528 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-02 08:51:58 +00:00
renovate[bot]
629152a80d
Update DefinitelyTyped types (non-major) ( #28542 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-02 08:50:45 +00:00
renovate[bot]
663a7b6ba9
Update devDependencies (non-major) ( #28543 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-02 08:50:29 +00:00
renovate[bot]
e082a98b4d
Update dependency mime-types to v3.5.2 ( #28556 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-02 08:50:08 +00:00
Michael Stanclift
c652b0e46b
Add wget to base Dockerfile ( #28548 )
2024-01-02 08:47:38 +00:00
Dennis Kamau
ac588daf37
Update copyright year to 2024 ( #28550 )
2024-01-01 19:08:01 +00:00
Jeremy Kescher
729465368e
Update README.md, to show CCN is now using main
2023-12-31 13:21:32 +01:00
Claire
97ce39a739
Merge pull request #2550 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 6374358357
2023-12-30 19:32:23 +01:00
Jeremy Kescher
0e653570ed
Fix bundle install no longer working
2023-12-30 17:17:39 +01:00
Essem
b8d7a1c07a
Check for content attribute in Misskey likes
2023-12-29 12:39:02 -06:00
Essem
95b2d969b1
Fix rubocop complaint
2023-12-29 12:39:02 -06:00
