Signed-off-by: Rémy Coutable <remy@rymai.me>

CE upstream - 2018-07-25 00:21 UTC

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

Add example output for file integrity check rake task

Closes #49244

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

Fix: redirect non-SSL request for gitlab registry to valid URL

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

HTTP host and URI should not be separated by a colon. Generated URLs was looking like http://registry.examples.com:/foo. That is throwing up let's encrypt cert requests for gitlab registry.

CE upstream - 2018-07-24 21:21 UTC

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

Fix slow Markdown rendering

Closes #49409

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

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

Closes #6028

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

[ci skip]

# Conflicts:
#   doc/user/profile/personal_access_tokens.md

The sanitize transformers were being duplicated each time the Markdown
renderer was called, leading to expontential growth in rendering times.

The problem was that although HTML::Pipeline::SanitizationFilter.WHITELIST
is a frozen hash, the `:transformers` array can be modified. We need
to do deep copy of this to avoid adding duplicates.

Closes #49409

Resolve "Admin area > Colored panels have wrong header color"

Closes #6209

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

Add best practice points regarding background migrations on huge tables

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

Fix typo in high availability docs

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

Remove extra parenthesis in PAT docs

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

Remove extra parenthesis in PAT docs

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

Backport various EE changes to Gitlab::Database

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

db/migrate/20180722103201_add_private_profile_to_users.rb

Add :sidekiq group to cleanup redis in after callback

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

# Conflicts:
#	db/schema.rb
#	doc/api/users.md
#	spec/requests/api/users_spec.rb

[ci skip]

Create class responsible for default object store settings

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

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

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

Remove timeouts for long running requests

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

Check Frozen String Literal in Danger

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

Add an option to have a private profile on GitLab

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

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

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

Make repository cleanup mandatory

Closes #49550

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

Update improve issue boards links to docs [ci skip]

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

Update improve issue boards links to docs [ci skip]

Closes gitlab-ce#49104

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix Vue datatype errors for markdownVersion parsing

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

Show decimal place up to single digit in Stacked Progress Bar

Closes gitlab-ee#6028

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