おしごとしよね 
59b24c3688 (upstream/main) Fix `/api/v1/streaming` sub-paths not being redirected (#23988)
dfa1be4ab4 Remove unused TOCGenerator (#23986)
8770473dbb add modal message when editing toot (#23936)
21db91a0a8 Remove sidebar dead code (#23984)
86f8aa2db2 Fix unconfirmed accounts being registered as active users (#23803)
4595862978 Remove pinned rexml (#23964)
c4cf92094e Do not strip tags from `Setting.site_short_description` (#23975)
dfa9843ac8 Fix pgBouncer resetting application name on every transaction (#23958)
be1792e1d4 Fix streaming API not being usable without `DATABASE_URL` (#23960)
ade3c5d40c Updates dev container and adds doc for getting started with GitHub Codespaces (#23872)
82a6cf4012 Enable Rubocop for app/views (#23874)
14f0b48fb6 Update browser gem to version 5.3.1 (#23945)
cb868228bd Do not leave Mastodon when clicking “Back” (#23953)
c599e289d8 Fix spec for api/v1/statuses/translations (#23956)
2d1ccb3d8b Restore missing fabricators (#23951)
続
506b16cf59 Pending example models minimal coverage (#23912)
7f4412eeeb User mailer spec coverage improvements (#23905)
42ddc45133 Admin controllers specs (#23917)
ad585fb195 Specs api v1 controllers (#23930)
cd99fa8ceb Fabricator specs (#23925)
c40d5e5a8f Misc coverage improvements for validators (#23928)
2f606ba122 Helpers specs coverage improvement (#23937)
00eb2269b6 Policies specs (#23924)
6a57c42316 Settings controllers specs (#23915)
39e7525c96 Add basic coverage for some worker jobs (#23943)
f9c2213ae5 Models specs coverage (#23940)
922837dc96 Upgrade to latest redis-rb 4.x and fix deprecations (#23616)
aa98c8fbeb Disable Style/SymbolArray (#23921)
1840d5d50c Remove pry gems (#23884)
b00f945d92 Remove implied StandardError rescue (#23942)
c65c34dfd1 Remove climate_control gem (#23886)
050f1669c6 Fix original account being unfollowed on migration before the follow request could be sent (#21957)
ddde4e0d95 Change `ActivityPub::DeliveryWorker` retries to be spread out more (#21956)
どば
5a8c651e8f Only offer translation for supported languages (#23879)
0872f3e3d7 Allow streaming to connect to postgress with self-signed certs (#21431)
de137e6bb0 Added support for specifying S3 storage classes in environment (#22480)
3f52e717fa Add tests for moderation actions without custom text (#23184)
6b16b77ab0 Fix external authentication not running onboarding code for new users (#23458)
8784498ebf Fix tootctl accounts migrate error due to typo (#23567)
d6679d1751 Add mail headers to avoid auto-replies (#23597)
f94aa70b81 Fix error when displaying post history of a trendable post in the admin interface (#23574)
a1347f456e Switched bookmark and favourites around (#23701)
02c6bad3ca Change unintended SMTP read timeout from 5 seconds to 20 seconds (#23750)
f8bb4d0d6b Fix server error when failing to follow back followers from `/relationships` (#23787)
b55fc883b6 Fix duplicate “Publish” button on mobile (#23804)
どばどば
c2a046ded1 Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805)
CONFLICT (content): Merge conflict in streaming/index.js
あい
21431と23960とで弊ぼっちの事情に対応できてるかもわね。
$ git checkout --theirs streaming/index.js
$ git add streaming/index.js
ダメじゃんw
ERR! error: no pg_hba.conf entry … no encryption
if (process.env.DB_SSLMODE) {
switch(process.env.DB_SSLMODE) {
case 'disable':
case '':
baseConfig.ssl = false;
break;
case 'no-verify':
baseConfig.ssl = { rejectUnauthorized: false };
break;
default:
baseConfig.ssl = {};
break;
}
}
ふむ
$ heroku config:set DB_SSLMODE=ssl-noverify
$ heroku config:unset NODE_DB_SSLMODE
まちがいたー←
$ heroku config:set DB_SSLMODE=no-verify
DATABASE_URLが設定されているとDB_SSLMODEが無視されるようになってる。ナンデ…。
\Master?/ \ますたー/
Merged mastodon/mastodon at 59b24c3688628a3cb778e71fc0684636cbda557b.
弊ぼっち用にはDB_SSLMODEでsslの設定を上書きするようにしたんだけどsslの設定が無い場合だけにした方がよかったかもね
https://github.com/zunda/mastodon/commit/9dea03016bb6129c347a3808d97d22798ca3e360