mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream
Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's theming system. Updated the line as upstream did.
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class AddQuotesCountToStatusStat < ActiveRecord::Migration[8.0]
|
||||
def change
|
||||
add_column :status_stats, :quotes_count, :bigint, null: false, default: 0
|
||||
end
|
||||
end
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema[8.0].define(version: 2025_08_19_100545) do
|
||||
ActiveRecord::Schema[8.0].define(version: 2025_08_20_084312) do
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "pg_catalog.plpgsql"
|
||||
|
||||
@@ -1104,6 +1104,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_19_100545) do
|
||||
t.datetime "updated_at", precision: nil, null: false
|
||||
t.bigint "untrusted_favourites_count"
|
||||
t.bigint "untrusted_reblogs_count"
|
||||
t.bigint "quotes_count", default: 0, null: false
|
||||
t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user