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

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

Fix formatting of object storage supported editions

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

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

# 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

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.

Add daylight saving time support for pipeline schedules

Closes #37165

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

# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/serializers/environment_entity.rb
#	app/views/admin/application_settings/show.html.haml
#	db/schema.rb
#	doc/ci/examples/README.md
#	doc/topics/autodevops/index.md
#	doc/user/project/merge_requests/index.md
#	lib/gitlab/git_access.rb
#	locale/gitlab.pot
#	spec/lib/gitlab/git_access_spec.rb
#	spec/serializers/environment_entity_spec.rb

[ci skip]

Make sure ConflictsService does not raise for conflicting submodules

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

Fix a typo on CI Runner page on Projects

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

Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master'

Backport some changes from EE

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