CE upstream - 2018-07-24 09:22 UTC

See merge request gitlab-org/gitlab-ee!6636

[EE-port] Allow users to mark their profile as private

See merge request gitlab-org/gitlab-ee!6603

Update improve issue boards links to docs [ci skip]

Closes gitlab-ce#49104

See merge request gitlab-org/gitlab-ee!6459

This will hide activities, events, member since from the profile page
or the API.

Resolve "ee-specific-check checked against the wrong base when there's no CE branch"

Closes #6890

See merge request gitlab-org/gitlab-ee!6594

Fix typo in high availability docs

See merge request gitlab-org/gitlab-ee!6503

Geo: Add spec for uploading import/export archives

See merge request gitlab-org/gitlab-ee!6627

Add docs to disable proxy listener

See merge request gitlab-org/gitlab-ce!19734

Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'"

See merge request gitlab-org/gitlab-ce!20633

Fixing link with the docs of regexp syntax.

See merge request gitlab-org/gitlab-ee!6539

In docs, add `No+Milestone` for querying by milestone

See merge request gitlab-org/gitlab-ce!20784

Annotate Gitlab::Git::Repository#fetch_ref

See merge request gitlab-org/gitlab-ce!20742

CE upstream - 2018-07-23 19:55 UTC

Closes #6977

See merge request gitlab-org/gitlab-ee!6633

Fix timing in AssigneesListComponent tests

Closes #6987

See merge request gitlab-org/gitlab-ee!6629

CE upstream - 2018-07-23 18:21 UTC

See merge request gitlab-org/gitlab-ee!6632

Add filter for minimal access level in groups and projects API

Closes #48165

See merge request gitlab-org/gitlab-ce!20478

Signed-off-by: Marko, Peter <peter.marko@siemens.com>

Signed-off-by: Marko, Peter <peter.marko@siemens.com>

Signed-off-by: Marko, Peter <peter.marko@siemens.com>

Improving performance of posting a comment by reducing memory + CPU

See merge request gitlab-org/gitlab-ce!20779

Merge branch '6977-follow-up-from-ee-resolve-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master'

Use render instead of render_if_exists in app/views/projects/services/prometheus/_show.html.haml

Closes gitlab-ee#6977

See merge request gitlab-org/gitlab-ce!20783

# Conflicts:
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

Remove instrumentation for Rouge::Plugins::{Redcarpet,CommonMark}

See merge request gitlab-org/gitlab-ce!20791

Enable frozen strings in remaining lib/banzai/filter/*.rb files

See merge request gitlab-org/gitlab-ce!20777

Adds Vuex store to handle the data for tests reports in MR widget

See merge request gitlab-org/gitlab-ce!20709

The removal in 4d376c66 had an unintended
side effect in that it got rid of the `require 'rouge/plugins/redcarpet'`.

Mention how we use gitlab-triage

See merge request gitlab-org/gitlab-ce!20787