Merge branch 'private-repos'
authorChristian Johansen <christian@cjohansen.no>
Wed, 18 Apr 2012 09:10:05 +0000 (11:10 +0200)
committerChristian Johansen <christian@cjohansen.no>
Wed, 18 Apr 2012 09:10:05 +0000 (11:10 +0200)
commite2a9170d36422f1f05e90d904fb14a24ffd5c0fd
treeb4c020c97db90b11ac9b59bd4b6e500387f864eb
parent534352a6841edf55dc861d82360d5624fa4e987c
parent2496ad6cc7839faf033c6db2b92c2506e56e30da
Merge branch 'private-repos'

Conflicts:
Gemfile
Gemfile.lock
app/controllers/merge_requests_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
test/unit/repository_test.rb
test/unit/user_test.rb
15 files changed:
Gemfile
Gemfile.lock
app/controllers/admin/users_controller.rb
app/controllers/merge_request_versions_controller.rb
app/controllers/merge_requests_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
app/views/repositories/edit.html.erb
config/gitorious.sample.yml
config/routes.rb
public/stylesheets/base.css
test/functional/admin/users_controller_test.rb
test/unit/project_test.rb
test/unit/repository_test.rb
test/unit/user_test.rb