diff options
| -rw-r--r-- | config/settings.yml | 2 | ||||
| -rw-r--r-- | db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb | 17 | ||||
| -rw-r--r-- | db/schema.rb | 10 |
3 files changed, 18 insertions, 11 deletions
diff --git a/config/settings.yml b/config/settings.yml index b0d3dfa3a..65e7a7871 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -35,7 +35,7 @@ defaults: &defaults flavour: 'glitch' skin: 'default' aggregate_reblogs: true - advanced_layout: true + advanced_layout: false notification_emails: follow: false reblog: false diff --git a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb new file mode 100644 index 000000000..72b7c609d --- /dev/null +++ b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb @@ -0,0 +1,17 @@ +class PreserveOldLayoutForExistingUsers < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def up + # Assume that currently active users are already using the layout that they + # want to use, therefore ensure that it is saved explicitly and not based + # on the to-be-changed default + + User.where(User.arel_table[:current_sign_in_at].gteq(1.month.ago)).find_each do |user| + next if Setting.unscoped.where(thing_type: 'User', thing_id: user.id, var: 'advanced_layout').exists? + user.settings.advanced_layout = true + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 63897a0e7..e2c8256b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -208,16 +208,6 @@ ActiveRecord::Schema.define(version: 2019_11_18_102858) do t.index ["target_account_id"], name: "index_blocks_on_target_account_id" end - create_table "bookmarks", force: :cascade do |t| - t.bigint "account_id", null: false - t.bigint "status_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["account_id", "status_id"], name: "index_bookmarks_on_account_id_and_status_id", unique: true - t.index ["account_id"], name: "index_bookmarks_on_account_id" - t.index ["status_id"], name: "index_bookmarks_on_status_id" - end - create_table "conversation_mutes", force: :cascade do |t| t.bigint "conversation_id", null: false t.bigint "account_id", null: false |