Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb

Doorkeeper update

https://gitlab.com/gitlab-org/omnibus-gitlab/issues/398

See merge request !1392

Update changelog

See merge request !292

Preview appearance bug

#215

See merge request !291

Gitlab shell bump

See merge request !1391

OAuth2 API documentation

https://dev.gitlab.org/gitlab/gitlabhq/issues/1713

See merge request !1388

Conflicts:
	app/helpers/projects_helper.rb

Prose requirement

Feel free to improve or link to authoritative source.

See merge request !285

Improve readme to website

addresses some of https://dev.gitlab.org/gitlab/organization/issues/100.

See merge request !1355

First entry in wiki history leads to newest revision.

Scroll below the navbar

Fixes #1866

Show the markdown anchors by scrolling below the fixed top navbar.

See merge request !1390

Git HTTP blacklist

See merge request !1328

Add Changelog Guidelines to monthly.md

Fixes #1868

Added the changelog guidelines according to the issue mentioned above. @sytse I didn't add the extra lines to the 7.7.0 log, since we have a codefreeze soon.

/cc @job

See merge request !1389

Added DISCLAIMER to CHANGELOG

 ForbiddenAction constant name fix

See merge request !1387

Kerberos docs

See merge request !289

Refactor push data builder

See merge request !1384

Admin email groups and projects select box

Fixes #219

See merge request !288