Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/views/groups/members.html.haml

Don't leak information about private project existence via Git-over-SSH/HTTP.

Fixes #2040 and https://gitlab.com/gitlab-org/gitlab-ce/issues/343.

Both `Grack::Auth` (used by Git-over-HTTP) and `Api::Internal /allowed` (used by gitlab-shell/Git-over-SSH) now return a generic "Not Found" error when the project exists but the user doesn't have access to it.

See merge request !1578

Update git attributes for changelog-ee

See merge request !337

Render go-import meta tag for private repos.

The previously solution (626f5bab) required a change to nginx config and broke visits from Googlebot and other clients including "go" in their user agent.

See merge request !1587

Remove duplicate Settings link in admin area.

Fixes #250

See merge request !330

Clearly mark it as installation from source.

See merge request !1622

Add documentation about help txt page.

Related to #240

See merge request !332

Add changelog entry for SSH key prefix stripping.

See merge request !335

Don't show Unassigned in user select when searching.

Fixes #2056.

When a search term is present, the Unassigned item isn't rendered, so the highlighted item is the first search result and hitting Enter works as expected.

See merge request !1620

Fix import check for case sensetive namespaces

If you already have namespace `ABc` and you try to import project with namespace `abC` - import will fail with 422 error.

cc @valery

See merge request !1618

Count commits in branches as well in the commit calendar

This MR fixes a small bug in the commit calendar.
Currently only commits that are in the master branch are counted.
With this change, commits in other branches are included as well.

fixes one of the issues found in #1162

See merge request !362

Fix merge request URL passed to Webhooks

If you look at the data structure passed to Webhooks, you will see:

`"url"=>nil`

I don't think any of the Webhooks or services are using this yet, so right now nothing so far depends upon this value being correct.

See merge request !352

Revert "Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx"

This reverts commit 51349ca3, reversing
changes made to b180476b.

Fixed changelog for MR 8501

CE to EE

See merge request !333

Enable ParenthesesAsGroupedExpression rule

See merge request !1617

Add Brakeman - Static analysis security scanner for Ruby on Rails

See merge request !1616

Cirosantilli link to button

For https://github.com/gitlabhq/gitlabhq/pull/7912

See merge request !1614

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

Ignore LDAP SSH key prefix and invalid keys.

See #214 and #230.

cc @job

See merge request !327

Reduce amount of sql queries on dashboard projects page

For https://github.com/gitlabhq/gitlabhq/issues/7218

See merge request !1613