Conflicts:

	features/steps/profile/profile_ssh_keys.rb

Failing test.

Working check.

Repaired Get patch

Fix HTML entities being parsed in GFM

Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!

Closes #1308

Be more resilient in the case of missing omniauth settings

Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).

Project hooks API

specs DRY up

Update votes for issues and merge requests

Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb

tree view need use ascii-8bit, file name need be utf8.

don't load commit logs when viewing blob

FIX: Empty string in commit message

Cucumber => Spinach

API errors refactoring