gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-01 14:02:02 +09:00
commit 9fa468a4bf
30 changed files with 239 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
db/migrate/20230215074423_move_user_settings.rb
View file

@ -9,6 +9,9 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
default_sensitive: 'web.default_sensitive',
default_language: 'default_language',
public_post_to_unlisted: 'public_post_to_unlisted',
reject_public_unlisted_subscription: 'reject_public_unlisted_subscription',
reject_unlisted_subscription: 'reject_unlisted_subscription',
send_without_domain_blocks: 'send_without_domain_blocks',
noindex: 'noindex',
theme: 'theme',
trends: 'web.trends',

8
db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb Normal file
View file

@ -0,0 +1,8 @@
class AddRejectInvalidSubscriptionToDomainBlocks < ActiveRecord::Migration[6.1]
def change
safety_assured do
remove_column :domain_blocks, :reject_send_unlisted_dissubscribable, :boolean, null: false, default: false
end
add_column :domain_blocks, :detect_invalid_subscription, :boolean, null: false, default: false
end
end

5
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.define(version: 2023_04_27_233749) do
ActiveRecord::Schema.define(version: 2023_04_30_110057) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -192,6 +192,7 @@ ActiveRecord::Schema.define(version: 2023_04_27_233749) do
t.boolean "group_allow_private_message"
t.integer "searchability", default: 2, null: false
t.boolean "dissubscribable", default: false, null: false
t.boolean "stop_emoji_reaction_streaming", default: false
t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id", where: "(moved_to_account_id IS NOT NULL)"
@ -471,7 +472,6 @@ ActiveRecord::Schema.define(version: 2023_04_27_233749) do
t.boolean "reject_favourite", default: false, null: false
t.boolean "reject_reply", default: false, null: false
t.boolean "reject_send_not_public_searchability", default: false, null: false
t.boolean "reject_send_unlisted_dissubscribable", default: false, null: false
t.boolean "reject_send_public_unlisted", default: false, null: false
t.boolean "reject_send_dissubscribable", default: false, null: false
t.boolean "reject_send_media", default: false, null: false
@ -481,6 +481,7 @@ ActiveRecord::Schema.define(version: 2023_04_27_233749) do
t.boolean "reject_new_follow", default: false, null: false
t.boolean "hidden", default: false, null: false
t.boolean "hidden_anonymous", default: false, null: false
t.boolean "detect_invalid_subscription", default: false, null: false
t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
end