Merge branch 'next' into feature/rails3
authorMarius Mathiesen <marius@gitorious.org>
Tue, 30 Oct 2012 08:22:59 +0000 (09:22 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Tue, 30 Oct 2012 08:22:59 +0000 (09:22 +0100)
commit510deb1f70fd011a2713aa91e3f3d4a5ae0e3720
tree6bcdbf2b5f98032513a5a632b0f0986a8fd516a1
parentbf9b8a6a03b3c73da7662fc9b1a4dfca868be706
parent5bc4114485c11c90e723b7420583fb20095f4e62
Merge branch 'next' into feature/rails3

In the process, removed the Ultrasphinx stubs that are no longer
required; moved search index initialization to application.rb.

Conflicts:
config/boot.rb
config/environment.rb
app/models/comment.rb
app/models/merge_request.rb
app/models/repository.rb
config/application.rb