OSDN Git Service

Merge branch 'deploy_keys'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 14 Jan 2012 19:26:35 +0000 (21:26 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 14 Jan 2012 19:26:35 +0000 (21:26 +0200)
commitcbd78922ee43c0124458e2867071f752cae712f4
tree5367dd4e0370f11bc5733de364016f2572a3323f
parent09b877ef29a0c641457eb986c5b228d003c51c16
parentdda6b0ab63eb8080e34b4273cfb6aadb7a29c028
Merge branch 'deploy_keys'

Conflicts:
app/views/layouts/project.html.haml
db/schema.rb
app/controllers/deploy_keys_controller.rb
app/models/project.rb
app/views/deploy_keys/index.html.haml
app/views/layouts/project.html.haml
app/views/repositories/_head.html.haml
config/routes.rb
db/schema.rb
spec/requests/projects_deploy_keys_spec.rb