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

Update votes for issues and merge requests

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

Fix haml template error for ldap login.

fixed commit title when commit message is an empty string and ensured that link_to_gfm helper doesn't break on nil body

Reduce the amount of JavaScript written in views

fix typo