summaryrefslogtreecommitdiff
path: root/db/migrate
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-09-27 12:27:39 -0500
committerRubén Dávila <ruben@gitlab.com>2017-10-05 08:25:27 -0500
commit328f4a505bcd2e7b38f907a24df437f8c35bc3af (patch)
tree7b1f8ae20ef5bd9e57fe0dc0848b358dad2a5403 /db/migrate
parent37dcfb6e31a65d487424c0bf73874aabb2e69020 (diff)
downloadgitlab-ce-328f4a505bcd2e7b38f907a24df437f8c35bc3af.tar.gz
Use a separate model to handle GPG subkeys
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20170926050624_add_parent_id_to_gpg_keys.rb10
-rw-r--r--db/migrate/20170927161718_create_gpg_key_subkeys.rb9
2 files changed, 9 insertions, 10 deletions
diff --git a/db/migrate/20170926050624_add_parent_id_to_gpg_keys.rb b/db/migrate/20170926050624_add_parent_id_to_gpg_keys.rb
deleted file mode 100644
index ef7675be106..00000000000
--- a/db/migrate/20170926050624_add_parent_id_to_gpg_keys.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddParentIdToGpgKeys < ActiveRecord::Migration
- DOWNTIME = false
-
- def change
- add_column :gpg_keys, :parent_id, :integer
- end
-end
diff --git a/db/migrate/20170927161718_create_gpg_key_subkeys.rb b/db/migrate/20170927161718_create_gpg_key_subkeys.rb
new file mode 100644
index 00000000000..d61b669f517
--- /dev/null
+++ b/db/migrate/20170927161718_create_gpg_key_subkeys.rb
@@ -0,0 +1,9 @@
+class CreateGpgKeySubkeys < ActiveRecord::Migration
+ def change
+ create_table :gpg_key_subkeys do |t|
+ t.binary :keyid
+ t.binary :fingerprint
+ t.references :gpg_key, null: false, index: true, foreign_key: { on_delete: :cascade }
+ end
+ end
+end