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

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
This commit is contained in:
Claire
2023-09-21 15:12:00 +02:00
parent 5efa6ac771 0fbefb6f67
commit f05985f8ec
21 changed files with 1081 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrate/20230215074423_move_user_settings.rb
View File

@@ -69,7 +69,7 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
MAPPING.each do |legacy_key, new_key|
value = previous_settings[legacy_key]&.value
next if value.blank?
next if value.nil?
if value.is_a?(Hash)
value.each do |nested_key, nested_value|