diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-10 15:39:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-10 16:22:31 +0200 |
| commit | e5a603206dfa76e2cd1b8a7fbb940fbd844b436c (patch) | |
| tree | c3271f86b91ce2d13aea4f111dad6da4d07dcc04 /db/migrate | |
| parent | 90b492143dae5cbaf884b12fbfd823c9f65d392f (diff) | |
| parent | 5b8603879f06573d51c5c33edda6f410d1af7a02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20180808175627_create_account_pins.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/db/migrate/20180808175627_create_account_pins.rb b/db/migrate/20180808175627_create_account_pins.rb new file mode 100644 index 000000000..43d8185be --- /dev/null +++ b/db/migrate/20180808175627_create_account_pins.rb @@ -0,0 +1,12 @@ +class CreateAccountPins < ActiveRecord::Migration[5.2] + def change + create_table :account_pins do |t| + t.belongs_to :account, foreign_key: { on_delete: :cascade } + t.belongs_to :target_account, foreign_key: { on_delete: :cascade, to_table: :accounts } + + t.timestamps + end + + add_index :account_pins, [:account_id, :target_account_id], unique: true + end +end |