Remove ee dynamic imports

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

[ci skip]

[ci skip]

Use dynamic imports in dispatcher (Part 3) (EE)

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

Burndown chart docs update

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

CE upstream - 2018-02-22 15:26 UTC

Closes #4975 and gitlab-com/infrastructure#3734

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

Docs milestones refactor EE

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

Resolve "Add option to overwrite diverged branches when pull mirroring"

Closes #4723

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

Docs: search/replace "Enterprise Edition" and adjust when applicable

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

Fix 500 error when loading an invalid upload URL

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

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

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

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

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

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

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

# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/gl_dropdown.js
#	app/assets/javascripts/labels_select.js
#	changelogs/unreleased-ee/4929-internationalize-lock-files.yml
#	config/webpack.config.js
#	ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
#	ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml

[ci skip]

Harmonize CE and EE JS code

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

[EE] Harmonize CE and EE JS code

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

Resolve "ActionView::Template::Error: 366..524 out of range"

Closes #42332

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

Resolve "Spec failure: spec/features/users_spec.rb"

Closes #43495

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

Backport of Webpack auto include for EE imports

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

Webpack auto include for EE imports

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

Add DAST in merge requests index page

Closes gitlab-ce#42916

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

Add missing link to products for roadmaps docs

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

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

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

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

CE upstream - 2018-02-21 21:27 UTC

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

Rugged sometimes chops a context line in between bytes, resulting in the context
line having an invalid encoding: https://github.com/libgit2/rugged/issues/716

When that happens, we will try to detect the encoding for the diff, and
sometimes we'll get it wrong. If that difference in encoding results in a
difference in string lengths between the diff and the underlying blobs, we'd
fail to highlight any inline diffs, and return a 500 status to the user.

As we're using the underlying blobs, the encoding is 'correct' anyway, so if the
string range is invalid, we can just discard the inline diff highlighting. We
still report to Sentry to ensure that we can investigate further in future.

Add links to relevant issues in scripts/ee-files-location-check

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