Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class AddPublishedAtToPreviewCards < ActiveRecord::Migration[7.0]
|
||||
def change
|
||||
add_column :preview_cards, :published_at, :datetime
|
||||
end
|
||||
end
|
432
db/schema.rb
432
db/schema.rb
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user