mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '119c7aa0df' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2024-04-06 20:34:07 +02:00
commit 777984faeb
70 changed files with 547 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb Normal file
View file

@ -0,0 +1,8 @@
# frozen_string_literal: true
class AddFollowersAndFollowingCountsToAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
def change
add_column :account_relationship_severance_events, :followers_count, :integer, default: 0, null: false
add_column :account_relationship_severance_events, :following_count, :integer, default: 0, null: false
end
end

7
db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb Normal file
View file

@ -0,0 +1,7 @@
# frozen_string_literal: true
class RemoveRelationshipsCountFromAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
def change
safety_assured { remove_column :account_relationship_severance_events, :relationships_count, :integer, default: 0, null: false }
end
end

8
db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb Normal file
View file

@ -0,0 +1,8 @@
# frozen_string_literal: true
class RemoveObsoleteRolesFromUsers < ActiveRecord::Migration[7.1]
def change
safety_assured { remove_column :users, :admin, :boolean, default: false, null: false }
safety_assured { remove_column :users, :moderator, :boolean, default: false, null: false }
end
end

7
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[7.1].define(version: 2024_03_21_160706) do
ActiveRecord::Schema[7.1].define(version: 2024_03_22_161611) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -93,9 +93,10 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_21_160706) do
create_table "account_relationship_severance_events", force: :cascade do |t|
t.bigint "account_id", null: false
t.bigint "relationship_severance_event_id", null: false
t.integer "relationships_count", default: 0, null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "followers_count", default: 0, null: false
t.integer "following_count", default: 0, null: false
t.index ["account_id", "relationship_severance_event_id"], name: "idx_on_account_id_relationship_severance_event_id_7bd82bf20e", unique: true
t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id"
t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707"
@ -1172,7 +1173,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_21_160706) do
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at", precision: nil
t.datetime "last_sign_in_at", precision: nil
t.boolean "admin", default: false, null: false
t.string "confirmation_token"
t.datetime "confirmed_at", precision: nil
t.datetime "confirmation_sent_at", precision: nil
@ -1187,7 +1187,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_21_160706) do
t.string "otp_backup_codes", array: true
t.bigint "account_id", null: false
t.boolean "disabled", default: false, null: false
t.boolean "moderator", default: false, null: false
t.bigint "invite_id"
t.string "chosen_languages", array: true
t.bigint "created_by_application_id"