Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments

Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb

Use CommitDecorator more

Updated merge request subheading.

API changes

Handle LDAP missing credentials error with a flash message.

Create the githost.log file if necessary.

Issues API

Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.

This resolves issue #1121.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.

The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975c.

This resolves issue #1077.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

Fix english on the edit user form.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

Controllers refactoring with contexts
Move commit compare logic to model

Fixing MySQL syntax error