deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'deploy_keys'

Browse source 
Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb
This commit is contained in:
Dmitriy Zaporozhets 2012-01-14 21:26:35 +02:00
commit cbd78922ee
19 changed files with 234 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
db/migrate/20111231111825_add_project_id_to_key.rb Normal file
View file

@ -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