Merge remote-tracking branch 'official/master' into saltation
authorMatthias Hoermann <hoermann@saltation.de>
Tue, 3 May 2011 09:48:51 +0000 (11:48 +0200)
committerMatthias Hoermann <hoermann@saltation.de>
Tue, 3 May 2011 11:00:45 +0000 (13:00 +0200)
commited87d23dbb786eb2771a6786805ff8f5d7d70f8e
tree1a29c9f02e4e59084c0d40b74e05f80d20af183d
parent2881da9b8f1d11754af5b63091f100176025dc6f
parentc3e1d675667939e64ced1bb5b541c9042a1d60f8
Merge remote-tracking branch 'official/master' into saltation

Conflicts:
app/controllers/application_controller.rb
app/controllers/commits_controller.rb
app/controllers/repositories_controller.rb
app/models/project.rb
app/views/repositories/_clone_urls.html.erb
24 files changed:
app/controllers/application_controller.rb
app/controllers/comments_controller.rb
app/controllers/commits_controller.rb
app/controllers/events_controller.rb
app/controllers/merge_requests_controller.rb
app/controllers/repositories_controller.rb
app/controllers/site_controller.rb
app/controllers/trees_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/merge_request.rb
app/models/project.rb
app/models/repository.rb
app/views/repositories/_clone_urls.html.erb
app/views/repositories/new.html.erb
app/views/site/dashboard.html.erb
config/environment.rb
config/gitorious.sample.yml
config/initializers/gitorious_config.rb
config/locales/en.rb
config/routes.rb
test/functional/committerships_controller_test.rb
test/functional/repositories_controller_test.rb
test/unit/merge_request_test.rb