Merge branch 'deploy_keys'

Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb

2 files changed, 8 insertions, 1 deletions

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 935f108afe9..e4066f50443 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -39,12 +39,13 @@ ActiveRecord::Schema.define(:version => 20120110180749) 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|