neatchee 4691b0068c Merge latest upstream from glitch-soc/mastodon/main (#70) ... * Remove the search button from UI header when logged out (#25631) * Change account search to match by text when opted-in (#25599) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> * Fix ResolveURLService not resolving local URLs for remote content (#25637) * Remove `pkg-config` gem dependency (#25615) * Update Crowdin configuration file * Fix onboarding prompt being displayed because of disconnection gaps (#25617) * Use an Immutable Record as the root state (#25584) * Add index to backups on `user_id` column (#25647) * Fix rails `rewhere` deprecation warning in directories api controller (#25625) * Remove unused routes (#25578) * Fixing an issue with a missing argument (#2261) undefined * Update uri to version 0.12.2 (CVE fix) (#25657) * Change local and federated timelines to be in a single firehose column (#25641) * Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595) * Rails 7 update (#24241) * Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) * Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663) * Revert "Rails 7 update" (#25667) * [Glitch] Remove the search button from UI header when logged out Port 285a691936 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix onboarding prompt being displayed because of disconnection gaps Port 9934949fc4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Use an Immutable Record as the root state Port 78ba12f0bf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change local and federated timelines to be in a single firehose column Port cea9db5a0b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI Port 0512537eb6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI Port 5b46345459 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * Show local-only posts in “All” by default, and add back option to toggle it * Fix showing local only toots in "All" (#2265) * Fix warnings about missing dependency in hooks Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add `allowLocalOnly` to timelineId Without this local-only toots will never be loaded. feedType is checked to be public to not show local-only toots in the "Remote" tab. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add regex filter back to firehose (#2266) * Add regex filter back to firehose The regex filter will apply to all tabs and not be automatically applied when pinned. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Keep regex when pinned Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: jsgoldstein <jakegoldstein95@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Renaud Chaput <renchap@gmail.com> Co-authored-by: Matt Jankowski <matt@jankowski.online> Co-authored-by: Vivianne <puttabutta@gmail.com> Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com> Co-authored-by: mogaminsk <mgmnjp@icloud.com> Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>		2023-07-03 09:12:00 -07:00
..
migrate	Merge latest upstream from glitch-soc/mastodon/main (#70)	2023-07-03 09:12:00 -07:00
post_migrate	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
views	Fix some old migration scripts (#17394)	2022-01-30 21:38:54 +01:00
schema.rb	Merge latest upstream from glitch-soc/mastodon/main (#70)	2023-07-03 09:12:00 -07:00
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00