Merge tootsuite/master at 3023725936
This commit is contained in:
@@ -1,15 +1,5 @@
|
||||
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
|
||||
|
||||
class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
|
||||
include Mastodon::MigrationHelpers
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
def up
|
||||
add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
|
||||
end
|
||||
|
||||
def down
|
||||
remove_column :mutes, :hide_notifications
|
||||
def change
|
||||
add_column :mutes, :hide_notifications, :boolean, default: false, null: false
|
||||
end
|
||||
end
|
||||
|
@@ -0,0 +1,8 @@
|
||||
class DefaultExistingMutesToHidingNotifications < ActiveRecord::Migration[5.1]
|
||||
def up
|
||||
change_column_default :mutes, :hide_notifications, from: false, to: true
|
||||
|
||||
# Unfortunately if this is applied sometime after the one to add the table we lose some data, so this is irreversible.
|
||||
Mute.update_all(hide_notifications: true)
|
||||
end
|
||||
end
|
12
db/migrate/20171009222537_create_keyword_mutes.rb
Normal file
12
db/migrate/20171009222537_create_keyword_mutes.rb
Normal file
@@ -0,0 +1,12 @@
|
||||
class CreateKeywordMutes < ActiveRecord::Migration[5.1]
|
||||
def change
|
||||
create_table :keyword_mutes do |t|
|
||||
t.references :account, null: false
|
||||
t.string :keyword, null: false
|
||||
t.boolean :whole_word, null: false, default: true
|
||||
t.timestamps
|
||||
end
|
||||
|
||||
add_foreign_key :keyword_mutes, :accounts, on_delete: :cascade
|
||||
end
|
||||
end
|
@@ -0,0 +1,7 @@
|
||||
class MoveKeywordMutesIntoGlitchNamespace < ActiveRecord::Migration[5.1]
|
||||
def change
|
||||
safety_assured do
|
||||
rename_table :keyword_mutes, :glitch_keyword_mutes
|
||||
end
|
||||
end
|
||||
end
|
21
db/migrate/20171028221157_add_reblogs_to_follows.rb
Normal file
21
db/migrate/20171028221157_add_reblogs_to_follows.rb
Normal file
@@ -0,0 +1,21 @@
|
||||
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
|
||||
|
||||
class AddReblogsToFollows < ActiveRecord::Migration[5.1]
|
||||
include Mastodon::MigrationHelpers
|
||||
|
||||
safety_assured do
|
||||
disable_ddl_transaction!
|
||||
end
|
||||
|
||||
def up
|
||||
safety_assured do
|
||||
add_column_with_default :follows, :show_reblogs, :boolean, default: true, allow_null: false
|
||||
add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
remove_column :follows, :show_reblogs
|
||||
remove_column :follow_requests, :show_reblogs
|
||||
end
|
||||
end
|
13
db/schema.rb
13
db/schema.rb
@@ -147,6 +147,7 @@ ActiveRecord::Schema.define(version: 20171114080328) do
|
||||
t.datetime "updated_at", null: false
|
||||
t.bigint "account_id", null: false
|
||||
t.bigint "target_account_id", null: false
|
||||
t.boolean "show_reblogs", default: true, null: false
|
||||
t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
|
||||
end
|
||||
|
||||
@@ -155,9 +156,19 @@ ActiveRecord::Schema.define(version: 20171114080328) do
|
||||
t.datetime "updated_at", null: false
|
||||
t.bigint "account_id", null: false
|
||||
t.bigint "target_account_id", null: false
|
||||
t.boolean "show_reblogs", default: true, null: false
|
||||
t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
|
||||
end
|
||||
|
||||
create_table "glitch_keyword_mutes", force: :cascade do |t|
|
||||
t.bigint "account_id", null: false
|
||||
t.string "keyword", null: false
|
||||
t.boolean "whole_word", default: true, null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.index ["account_id"], name: "index_glitch_keyword_mutes_on_account_id"
|
||||
end
|
||||
|
||||
create_table "imports", force: :cascade do |t|
|
||||
t.integer "type", null: false
|
||||
t.boolean "approved", default: false, null: false
|
||||
@@ -201,6 +212,7 @@ ActiveRecord::Schema.define(version: 20171114080328) do
|
||||
create_table "mutes", force: :cascade do |t|
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.boolean "hide_notifications", default: true, null: false
|
||||
t.bigint "account_id", null: false
|
||||
t.bigint "target_account_id", null: false
|
||||
t.boolean "hide_notifications", default: true, null: false
|
||||
@@ -477,6 +489,7 @@ ActiveRecord::Schema.define(version: 20171114080328) do
|
||||
add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
|
||||
add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
|
||||
add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
|
||||
add_foreign_key "glitch_keyword_mutes", "accounts", on_delete: :cascade
|
||||
add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
|
||||
add_foreign_key "media_attachments", "accounts", name: "fk_96dd81e81b", on_delete: :nullify
|
||||
add_foreign_key "media_attachments", "statuses", on_delete: :nullify
|
||||
|
Reference in New Issue
Block a user