Merge branch 'master' of gitorious.org:+fiit/gitorious/gitorious-fiit-mainline
authorIvan Pleško <iwancpp@gmail.com>
Sat, 14 May 2011 21:21:25 +0000 (23:21 +0200)
committerIvan Pleško <iwancpp@gmail.com>
Sat, 14 May 2011 21:21:25 +0000 (23:21 +0200)
commit4992f505b7967e01660a953397c3ec6208df4d1c
treef07b84768659b4e262497c346275c821c12c046f
parentfdc39f6f7af5961b1ca592dfbc5dff28dfe71d69
parent5180cdde7510859cac10c70a182ef28edfafd7a7
Merge branch 'master' of gitorious.org:+fiit/gitorious/gitorious-fiit-mainline

Conflicts:
app/controllers/application_controller.rb
app/views/site/dashboard.html.erb
config/gitorious.sample.yml
db/schema.rb
test/functional/admin/users_controller_test.rb
test/functional/sessions_controller_test.rb
test/functional/users_controller_test.rb
16 files changed:
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/controllers/users_controller.rb
app/models/user.rb
app/views/commit_diffs/_commit_infobox.html.erb
app/views/site/dashboard.html.erb
config/gitorious.sample.yml
config/locales/en.rb
config/locales/pt-BR.rb
config/routes.rb
db/schema.rb
lib/authenticated_system.rb
test/functional/admin/users_controller_test.rb
test/functional/sessions_controller_test.rb
test/functional/users_controller_test.rb
test/unit/user_test.rb