diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /db | |
parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'db')
-rw-r--r-- | db/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index a22e86837..a0187d5a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -547,6 +547,7 @@ ActiveRecord::Schema.define(version: 20180211015820) do add_foreign_key "account_moderation_notes", "accounts", column: "target_account_id" add_foreign_key "accounts", "accounts", column: "moved_to_account_id", on_delete: :nullify add_foreign_key "admin_action_logs", "accounts", on_delete: :cascade + add_foreign_key "backups", "users", on_delete: :nullify add_foreign_key "blocks", "accounts", column: "target_account_id", name: "fk_9571bfabc1", on_delete: :cascade add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade |