DeployKey moved to Key model

3 files changed, 9 insertions, 23 deletions

diff --git a/db/migrate/20111225202855_create_deploy_keys.rb b/db/migrate/20111225202855_create_deploy_keys.rb
deleted file mode 100644
index 60e7337504e..00000000000
--- a/db/migrate/20111225202855_create_deploy_keys.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateDeployKeys < ActiveRecord::Migration
-  def change
-    create_table :deploy_keys do |t|
-      t.integer  "project_id",    :null => false
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.text     "key"
-      t.string   "title"
-      t.string   "identifier"
-    end
-  end
-end
diff --git a/db/migrate/20111231111825_add_project_id_to_key.rb b/db/migrate/20111231111825_add_project_id_to_key.rb
new file mode 100644
index 00000000000..dc80cbdb71f
--- /dev/null
+++ b/db/migrate/20111231111825_add_project_id_to_key.rb
@@ -0,0 +1,6 @@
+class AddProjectIdToKey < ActiveRecord::Migration
+  def change
+    add_column :keys, :project_id, :integer, :null => true
+    change_column :keys, :user_id, :integer, :null => true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f6ac7d8d9b7..aab847e2cd8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,16 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111225202855) do
-
-  create_table "deploy_keys", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.text     "key"
-    t.string   "title"
-    t.string   "identifier"
-  end
+ActiveRecord::Schema.define(:version => 20111231111825) do
 
   create_table "issues", :force => true do |t|
     t.string   "title"
@@ -36,12 +27,13 @@ ActiveRecord::Schema.define(:version => 20111225202855) do
   end
 
   create_table "keys", :force => true do |t|
-    t.integer  "user_id",    :null => false
+    t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "key"
     t.string   "title"
     t.string   "identifier"
+    t.integer  "project_id"
   end
 
   create_table "merge_requests", :force => true do |t|