# Conflicts:
#	doc/administration/incoming_email.md
#	doc/administration/index.md
#	doc/api/merge_requests.md
#	doc/user/project/issues/create_new_issue.md
#	ee/app/assets/javascripts/protected_branches/index.js

[ci skip]

Remove mr_notes webpack bundle

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

EE Port of "Remove mr_notes webpack bundle"

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

Revert Project.public_or_visible_to_user changes but apply change to SnippetsFinder

Closes #42877

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

Removed terminal webpack bundle tag

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

Remove mirror webpack bundle entry

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

Add support for query params for labels endpoint

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

CE upstream - 2018-03-02 12:25 UTC

Closes gitaly#1046

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

# 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

Remove the "test" bundle and apply it conditionally within main.js

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

expose metrics in merge request api

Closes #41905

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

[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

Removes webpack bundle tag for two factor auth js

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

Remove protected branches webpack bundle tag

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

Removed burndown_chart webpack bundle

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

Slack notifications - Respect "Notify only default branch" for push events

Closes #33570

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

Update incoming emails documents

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

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