Mention admin privileges for k8s token creation

Closes #44457

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

Removed copy-pasted "Project merge method" section.

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

CE upstream - 2018-07-11 09:25 UTC

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

Fix object storage support notes

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

Fix formatting of object storage supported editions

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

Add documenation about how to active debug logging for gitlab-pages

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

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

Resolve "ee_compat_check should remove `ce-` prefix or `-ce` suffix as ee-specific check"

Closes #46519

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

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

Closes gitaly#387, gitaly#874, gitaly#750, and gitaly#665

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

Add missing maximum_timeout parameter

Closes #48625

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

[Rails5] Permit concurrent loads

Closes #48263

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

Fix doc for large table column rename

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

Resolve "MR Widget redesign was not done for license management / security products."

Closes #6857

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

adding a note to HA docs that omnibus will not recursively chown directories…

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

Properly handle colons in URL passwords

Closes #49080

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

Fix ArgumentError in GitGarbageCollectWorker Sidekiq job

Closes #49096

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

When the Gitaly call failed, the exception handling failed
because `method` is expected to have a parameter.

Closes #49096

Before b46d5b13, we relied on
`Addressable::URI` to parse the username/password in a URL, but this failed
when credentials contained special characters. However, this introduced a regression
where the parsing would incorrectly truncate the password if the password had a colon.

Closes #49080

Mock timeouts and Promise in SmartInterval tests

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

This uses a similar approach in ee_specific_check.rb

Remove timestamps from `locale/gitlab.pot`

Closes #49077

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

This will help us avoid conflicts when regenerating the pot file, the
timestamps aren't used by Crowdin.