CE upstream - 2018-07-12 12:22 UTC

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

Geo: Log to geo.log when the Log Cursor skips an event

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

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

# Conflicts:
#	app/views/projects/new.html.haml
#	doc/user/project/import/index.md
#	locale/gitlab.pot

[ci skip]

Remove old service architecture from Vue docs

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

Adding spec to test basic forking functionalities

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

Resolve "Follow-up from "Milestone tests""

Closes #48690

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

Add manifest import feature (EE port)

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

Add manifest import

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

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

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

Add examples for array and hash type API params

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

Optimize ProjectWiki#empty? check

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

i18n: externalize strings from 'app/views/explore'

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

Docs: fix typo on EKS doc

Closes #47421

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

Add a fast_timeout for the `ServerService.ServerInfo` endpoint

Closes #49116

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

Update project_import_export.md to include example remote import script and additional curl command

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

Revert "Log push output on exception" because it is no longer needed

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

Match against having letters and numbers for environment name

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

Remove Repository#path memoization

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

Resolve "do not set updated_at when creating note"

Closes #46930

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

Improvements to new entry dropdowns in Web IDE

Closes #44845

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

EE port of ide-row-dropdown-design-update

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

Fix Dangerfile failing on CHANGELOG check

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

The `empty?` check was iterating over all Wiki pages to determine
whether it was empty. Using the limit parameter allows us to bail
out early once we found a page.

Note that this currently only improves performance for GitLab 11.0
until https://gitlab.com/gitlab-org/gitaly/issues/1204 is fixed.

Relates to #40101

Remove timeouts from TimeTracker tests

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

Remove EE override for fixing extra comma in weights

Closes #6793

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

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

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