Conflicts:
	CHANGELOG

Add index to order columns

See merge request !1481

Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476

Don't have Markdown preview fail for long comments/wiki pages.

See https://github.com/gitlabhq/gitlabhq/issues/8611.

See merge request !1479

Update smtp example to add openssl_verify_mode

See merge request !1478

See https://github.com/gitlabhq/gitlabhq/issues/8611.

GitHub importer refactoring

See merge request !1477

Submit comment on command enter

Fixes #1869.

See merge request !1474

Remove duplicates from group milestone participants list.

See merge request !1473

Gitlab.com integration && Gitlab importer

#1933

See merge request !1456

Fixes #1869.

add editor command to update database.yml; cleanup

[skip ci]

Resolves #1673.