# Conflicts:
#   config/webpack.config.js

Remove ldap group links webpack entry point

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

Removed webpack bundle tag for add_gitlab_slack_application

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

[port] Add metrics in merge request api

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

Remove 2 factor authjs webpack bundle tag

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

Removed burndown_chart webpack bundle

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

Introduce common incoming email setup doc and new issue by email doc

Closes gitlab-ce#41046 and gitlab-ce#24849

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

File uploads on objects storage should use hashed storage

Closes #4952

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

# Conflicts:
#   config/webpack.config.js

CE upstream - 2018-03-01 21:23 UTC

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

[EE] Support additional LabelsFinder parameters for group labels

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

Add some strings that were missing in gitlab.pot

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

Document how to use external tracking database

Closes #4884

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

Remove protected branches webpack bundle tag (EE)

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

Remove roadmap webpack bundle entry point

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

# Conflicts:
#   config/webpack.config.js

Remove registry list webpack entry point (EE)

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

Improve mount epic to explicitly not mount if element is not found

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

# Conflicts:
#   config/webpack.config.js

Remove "issues" webpack bundles

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

Remove epic show and new epic webpack bundle tag

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