diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:50:32 +0100 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 15:59:59 +0100 |
commit | 479cdc2cac78241109d2cb9d8cfd22d36319d367 (patch) | |
tree | 2d4aee23df199f078516105b2266cacca9c94410 /db/migrate | |
parent | 2b0e8b86d8aa35ac094d18bfefaa81af916347fa (diff) | |
download | gitlab-ce-479cdc2cac78241109d2cb9d8cfd22d36319d367.tar.gz |
Fix bad merge [ci skip]
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20170120131253_create_chat_teams.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20170120131253_create_chat_teams.rb b/db/migrate/20170120131253_create_chat_teams.rb index 8f76b43960b..6476c239152 100644 --- a/db/migrate/20170120131253_create_chat_teams.rb +++ b/db/migrate/20170120131253_create_chat_teams.rb @@ -5,13 +5,13 @@ class CreateChatTeams < ActiveRecord::Migration def change create_table :chat_teams do |t| - t.integer :group_id, index: true + t.integer :namespace_id, index: true t.string :team_id t.string :name t.timestamps null: false end - add_foreign_key :chat_teams, :groups, on_delete: :cascade + add_foreign_key :chat_teams, :namespaces, on_delete: :cascade end end |