Merge remote-tracking branch 'origin/master' into saltation
authorMatthias Hoermann <taladar@taladar.net>
Mon, 11 Jul 2011 11:21:14 +0000 (13:21 +0200)
committerMatthias Hoermann <taladar@taladar.net>
Mon, 11 Jul 2011 11:21:14 +0000 (13:21 +0200)
commit571ea83bfb6a10e20df5503be42172f9d0ebcc4f
treed080f663f659df097a9f7b0af021a047aa3ce049
parentb2df9d8d5a105a6648a962928d1ebcb08e6f233e
parentff74db738a0d8dc0fa00dab8a51ddaff6a7296e8
Merge remote-tracking branch 'origin/master' into saltation

Conflicts:
app/controllers/trees_controller.rb
app/models/committership.rb
app/models/repository.rb
app/views/committerships/edit.html.erb
app/views/committerships/index.html.erb
app/views/committerships/new.html.erb
app/views/site/dashboard.html.erb
config/environment.rb
20 files changed:
app/controllers/application_controller.rb
app/controllers/blobs_controller.rb
app/controllers/commits_controller.rb
app/controllers/site_controller.rb
app/controllers/trees_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/helpers/messages_helper.rb
app/models/committership.rb
app/models/merge_request.rb
app/models/merge_request_version.rb
app/models/project.rb
app/models/repository.rb
app/views/committerships/_permissions_form.html.erb
app/views/site/dashboard.html.erb
config/gitorious.sample.yml
config/initializers/gitorious_config.rb
db/schema.rb
script/git-daemon
test/unit/project_test.rb