Conflicts:
	doc/update/6.x-or-7.x-to-7.7.md

CE master

See merge request !294

This reverts commit 1e45ba7f.

This reverts commit 204b3c12.

Fix anchor bug

Fixes #1886

See merge request !1395

7.7 CE into master

```
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:      app/controllers/projects/merge_requests_controller.rb
```

See merge request !293

When use anchors - conetent gets hidden under navbar. This commit fixes
with hack using margin+height combination

This reverts commit b1792d9e.

This reverts commit 5140bd88.

Rescue database error

We need to check which database is setup but we cannot assume that the database exists already. Not checking this will break rake gitlab:setup for packaging as we need to do asset precompile before the database exists.

See merge request !1393

Enable signup by default

See merge request !1394

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