Commit graph

1132 commits

Author SHA1 Message Date
KMY
218cb37fe3 Merge remote-tracking branch 'parent/main' into upstream-20240906 2024-09-09 08:47:15 +09:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812) 2024-09-08 18:41:37 +00:00
Matt Jankowski
be77a1098b
Extract Account::AUTOMATED_ACTOR_TYPES for "bot" actor_type values (#31772) 2024-09-06 07:49:38 +00:00
KMY(雪あすか)
db6db7e7e9
Merge branch 'kb_development' into upstream-20240906 2024-09-06 08:49:45 +09:00
KMY
f18eabfe75 Merge remote-tracking branch 'parent/main' into upstream-20240906 2024-09-06 08:42:24 +09:00
KMY(雪あすか)
f93dbec9d3
Bump version to 15.0-dev (#836) 2024-09-06 08:40:17 +09:00
David Roetzel
f85694acfd
Add credentials to redis sentinel configuration (#31768) 2024-09-05 14:06:58 +00:00
David Roetzel
7d91723f05
Support REDIS_SENTINEL_PORT variables (#31767) 2024-09-05 09:26:49 +00:00
David Roetzel
ef2bc8ea26
Add redis sentinel support to ruby part of code (#31744) 2024-09-04 14:10:45 +00:00
Matt Jankowski
2f0d0fc127
Add coverage for CLI::Accounts#fix_duplications task (#30639) 2024-09-03 15:36:59 +00:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration (#31694) 2024-09-02 14:19:55 +00:00
Matt Jankowski
85e8d1f285
Use rails configuration storage for paperclip path (#31651) 2024-08-30 09:46:09 +00:00
KMY(雪あすか)
665c632d66
Add: #406 ユーザーのカスタムCSS (#825)
* Add: #406 ユーザーのカスタムCSS

* Fix lint

* Fix lint

* カスタムCSSの保存先を変更

* キャッシュを考慮して別URLに変更
2024-08-29 07:55:01 +09:00
KMY
b39054ff3c Merge remote-tracking branch 'parent/main' into upstream-20240828 2024-08-28 20:26:35 +09:00
Matt Jankowski
bcc4b1078c
Fix Rails/RootPathnameMethods cop (#31582) 2024-08-26 07:35:07 +00:00
KMY
a5bbc3f93b Merge remote-tracking branch 'parent/main' into upstream-20240824 2024-08-24 09:39:11 +09:00
Claire
97f6baf977
Bump version to v4.3.0-beta.1 (#30989) 2024-08-23 16:07:32 +00:00
Claire
c493689e84
Change output format of repo:changelog task (#31546) 2024-08-23 12:55:54 +00:00
KMY
e7ccc0539f Merge remote-tracking branch 'parent/main' into upstream-20240813 2024-08-13 07:01:38 +09:00
Django
709dcd07f2
Add support for incoming <s> tag (#31375) 2024-08-12 11:10:05 +00:00
Claire
cbdd8edf68
Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Christian Schmidt
9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter (#31285) 2024-08-06 08:23:48 +00:00
KMY
8b09a57a91 Merge remote-tracking branch 'parent/main' into upstream-20240731 2024-07-31 13:00:13 +09:00
Claire
4eab6aef95
Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192) 2024-07-30 21:40:42 +00:00
KMY
a99f174d98 Merge commit '9e04007020' into upstream-20240725 2024-07-25 13:06:26 +09:00
Matt Jankowski
1b839d2cba
Fix mastodon:stats decoration of stats rake task (#31104) 2024-07-23 06:51:57 +00:00
KMY(雪あすか)
8e59cd0992
Add: #778 アカウント名・紹介文のフィルタリング (#779)
* Add: #778 アカウント名・紹介文のフィルタリング

* Fix test
2024-07-10 20:15:12 +09:00
KMY(雪あすか)
188bd6f5f9
Bump version to 14.0-dev (#776) 2024-07-07 23:24:20 +09:00
KMY
9a07550fa6 Merge remote-tracking branch 'parent/main' into upstream-20240705 2024-07-05 07:22:34 +09:00
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 (#30920) 2024-07-04 14:59:54 +00:00
Emelia Smith
47f0faebc9
Implement HTML ruby tags for east-asian languages (#30897) 2024-07-03 20:05:59 +00:00
Claire
ba6a558a70
Simplify color extraction code using bandunfold (#30869) 2024-06-28 22:41:27 +00:00
KMY
6955843321 Merge remote-tracking branch 'parent/main' into upstream-20240628 2024-06-28 08:57:12 +09:00
Claire
7a84b76bb1
Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
KMY
af2727387e Merge remote-tracking branch 'parent/main' into upstream-20240624 2024-06-24 08:38:12 +09:00
Claire
2cda1dd542
Fix compatibility with Redis < 6.2 again (#30412) 2024-06-19 16:59:37 +00:00
KMY
aa2cdc898a Merge remote-tracking branch 'parent/main' into upstream-20240618 2024-06-18 07:43:33 +09:00
Michael Stanclift
d5f02adad7
Add option to use native Ruby driver for Redis (#30717) 2024-06-17 12:28:01 +00:00
Claire
328d3a87f5
Fix libvips color extraction when multiple maxima differ only on blue component (#30632) 2024-06-11 13:58:10 +00:00
KMY
90f2ea9015 Merge remote-tracking branch 'parent/main' into upstream-20240610 2024-06-10 08:19:27 +09:00
Claire
82be5d033f
Improve handling of libvips failures (#30597) 2024-06-07 15:39:41 +00:00
Matt Jankowski
37e4d96b70
Restore verbose option to media remove cli (#30536) 2024-06-07 12:39:53 +00:00
Emelia Smith
e02d23b549
Change read:me scope to profile scope (#30357)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
Eugen Rochko
5f15a892fa
Add support for libvips in addition to ImageMagick (#30090)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
KMY
8927b1444b Merge remote-tracking branch 'parent/main' into upstream-20240604 2024-06-04 08:02:05 +09:00
Claire
974335e414
Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
KMY
13ad383039 Merge remote-tracking branch 'parent/main' into upstream-20240531 2024-05-31 08:27:09 +09:00
Claire
7f808ff6e9
Bump version to v4.3.0-alpha.4 (#30482) 2024-05-30 13:34:46 +00:00
Claire
3fa0dd0b88
Merge pull request from GHSA-c2r5-cfqr-c553
* Add hardening monkey-patch to prevent IP spoofing on misconfigured installations

* Remove rack-attack safelist
2024-05-30 14:24:29 +02:00
Claire
5d7d23999c
Fix leaking Elasticsearch connections in Sidekiq processes (#30450) 2024-05-29 08:15:06 +00:00