about summary refs log tree commit diff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-11-06 14:38:28 +0100
committerThibaut Girka <thib@sitedethib.com>2019-11-06 14:38:28 +0100
commit0ae7d8427394d5f98fb2bd78eaae9bf848831186 (patch)
treee15a6321eedcbf9a2ae55ce24e7d8960f233b5ef /db/schema.rb
parent00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff)
parent42d9ca21de298e1d51b87723745f2b17e4169894 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb
index eb86a9f68..946f2c5e6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_10_07_013357) do
+ActiveRecord::Schema.define(version: 2019_10_31_163205) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -383,7 +383,7 @@ ActiveRecord::Schema.define(version: 2019_10_07_013357) do
   create_table "list_accounts", force: :cascade do |t|
     t.bigint "list_id", null: false
     t.bigint "account_id", null: false
-    t.bigint "follow_id", null: false
+    t.bigint "follow_id"
     t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
     t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
     t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"