Merge branch 'master' into private_repos
authorMarko Peltola <marko.peltola@jyu.fi>
Thu, 8 Apr 2010 10:18:49 +0000 (13:18 +0300)
committerMarko Peltola <marko.peltola@jyu.fi>
Thu, 8 Apr 2010 10:18:49 +0000 (13:18 +0300)
commitb9b5513cf39792b0e7bc35dbcff6f54a2d781589
tree334fccf36e90483843434dcb828d124feb1eda68
parente0244adddba0f07d2a3d63bfb2a1f5299a053de4
parent54c96e4dce4cfbce34b20c14cc34c1f19ed066e1
Merge branch 'master' into private_repos

Conflicts:
app/views/repositories/edit.html.erb
app/views/site/new_repo_and_project.html.erb

Signed-off-by: Marko Peltola <marko.peltola@jyu.fi>
app/controllers/repositories_controller.rb
app/controllers/site_controller.rb
app/models/repository.rb
app/views/repositories/_overview.html.erb
app/views/repositories/edit.html.erb
app/views/site/new_repo_and_project.html.erb
db/schema.rb