Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.
This commit is contained in:
Claire
2025-10-06 19:12:25 +02:00
parent d5097398fe 4dc21d7afd
commit 73a625c284
105 changed files with 692 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/schema.rb
View File

@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2025_09_24_170259) do
ActiveRecord::Schema[8.0].define(version: 2025_10_02_140103) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"